[pkg-kde-commits] rev 2826 - trunk/packages/kdelibs/debian/patches
Isaac Clerencia
isaac at costa.debian.org
Wed Jan 11 20:56:59 UTC 2006
Author: isaac
Date: 2006-01-11 20:56:26 +0000 (Wed, 11 Jan 2006)
New Revision: 2826
Modified:
trunk/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
Update buildprep
Modified: trunk/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/98_buildprep.diff 2006-01-11 19:22:44 UTC (rev 2825)
+++ trunk/packages/kdelibs/debian/patches/98_buildprep.diff 2006-01-11 20:56:26 UTC (rev 2826)
@@ -2,7 +2,58 @@
# vi: ft=diff
--- Makefile.in
+++ Makefile.in
-@@ -286,6 +286,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -93,12 +93,6 @@
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive nmcheck-recursive bcheck-recursive
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(potdir)"
+ potDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pot_DATA)
+@@ -130,6 +124,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -171,8 +167,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -249,7 +243,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -286,6 +279,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -12,7 +63,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -341,6 +337,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,8 +347,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -369,6 +364,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -544,7 +540,7 @@
.SUFFIXES:
am--refresh:
@:
@@ -21,7 +97,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,12 +589,12 @@
+@@ -586,12 +582,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -36,7 +112,7 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
-@@ -603,7 +606,7 @@
+@@ -603,7 +599,7 @@
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -45,7 +121,156 @@
cd $(top_srcdir) && $(AUTOHEADER)
rm -f stamp-h1
touch $@
-@@ -1215,7 +1218,7 @@
+@@ -625,7 +621,7 @@
+ test -z "$(potdir)" || $(mkdir_p) "$(DESTDIR)$(potdir)"
+ @list='$(pot_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(potDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(potdir)/$$f'"; \
+ $(potDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(potdir)/$$f"; \
+ done
+@@ -633,7 +629,7 @@
+ uninstall-potDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pot_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(potdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(potdir)/$$f"; \
+ done
+@@ -645,13 +641,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -663,7 +653,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -671,13 +661,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -698,7 +682,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -800,17 +784,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -824,15 +806,15 @@
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+ dist-bzip2: distdir
+- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+ dist-tarZ: distdir
+- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
++ $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+ dist-shar: distdir
+@@ -845,7 +827,7 @@
+ $(am__remove_distdir)
+
+ dist dist-all: distdir
+- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+ # This target untars the dist file and tries a VPATH configuration. Then
+@@ -854,11 +836,11 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+ *.tar.Z*) \
+- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
++ uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+@@ -942,7 +924,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1007,7 +989,7 @@
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+ check-am clean clean-generic clean-libtool clean-recursive \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+- dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
++ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-recursive distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+@@ -1215,7 +1197,7 @@
.NOEXPORT:
#>+ 2
@@ -2927,7 +3152,45 @@
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--- arts/Makefile.in
+++ arts/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -85,6 +85,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -126,8 +128,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -204,7 +204,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -241,6 +240,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -2937,7 +3200,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -296,6 +298,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +308,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -324,6 +325,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -487,7 +489,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -2946,7 +3234,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -525,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2958,9 +3246,231 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -547,13 +549,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -565,7 +561,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -573,13 +569,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -600,7 +590,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -700,17 +690,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -739,7 +727,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- arts/kde/Makefile.in
+++ arts/kde/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) $(kiotest_SOURCES) $(kiotestslow_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -56,14 +58,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(artskdeincludedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(artskdeincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -102,24 +97,73 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/artskde.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kartsdispatcher.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kartsfloatwatch.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kartsserver.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaudioconverter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaudiomanagerplay.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplaystream.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaudiorecordstream.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconverttest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatarequest_impl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kioinputstream_impl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiotest.Po ./$(DEPDIR)/kiotestslow.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kplayobject.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectcreator.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kvideowidget.Plo
++#>+ 32
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libartskde_la.all_cc.P $(DEPDIR)/libartskde_la.all_cpp.P ./$(DEPDIR)/artskde.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsdispatcher.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsfloatwatch.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsserver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioconverter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudiomanagerplay.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplaystream.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudiorecordstream.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconverttest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatarequest_impl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kioinputstream_impl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiotest.Po ./$(DEPDIR)/kiotestslow.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobject.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectcreator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kvideowidget.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/artskde.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsdispatcher.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsfloatwatch.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kartsserver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioconverter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudiomanagerplay.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplaystream.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudiorecordstream.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconverttest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatarequest_impl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kioinputstream_impl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiotest.Po ./$(DEPDIR)/kiotestslow.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobject.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectcreator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplayobjectfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kvideowidget.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) \
+ $(kiotest_SOURCES) $(kiotestslow_SOURCES)
+ DIST_SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) \
+@@ -143,6 +187,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -184,8 +230,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -262,7 +306,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -299,6 +342,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -2970,7 +3480,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -354,6 +400,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -363,8 +410,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -382,6 +427,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -576,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -2979,7 +3514,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -614,16 +660,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -2991,7 +3526,108 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -995,18 +998,18 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -631,8 +677,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -695,42 +741,48 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -747,7 +799,7 @@
+ test -z "$(artskdeincludedir)" || $(mkdir_p) "$(DESTDIR)$(artskdeincludedir)"
+ @list='$(artskdeinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(artskdeincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(artskdeincludedir)/$$f'"; \
+ $(artskdeincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(artskdeincludedir)/$$f"; \
+ done
+@@ -755,7 +807,7 @@
+ uninstall-artskdeincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(artskdeinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(artskdeincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(artskdeincludedir)/$$f"; \
+ done
+@@ -862,7 +914,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+ maintainer-clean-generic:
+@@ -995,18 +1047,18 @@
mocs: kconverttest.moc
#>+ 3
@@ -3016,7 +3652,7 @@
#>+ 3
kplayobjectcreator.moc: $(srcdir)/kplayobjectcreator.h
-@@ -1030,13 +1033,6 @@
+@@ -1030,13 +1082,6 @@
mocs: kdatarequest_impl.moc
#>+ 3
@@ -3030,7 +3666,7 @@
kplayobject.moc: $(srcdir)/kplayobject.h
$(MOC) $(srcdir)/kplayobject.h -o kplayobject.moc
-@@ -1051,11 +1047,11 @@
+@@ -1051,11 +1096,11 @@
mocs: kplayobjectfactory_p.moc
#>+ 3
@@ -3045,7 +3681,7 @@
#>+ 3
kaudiorecordstream_p.moc: $(srcdir)/kaudiorecordstream_p.h
-@@ -1065,11 +1061,18 @@
+@@ -1065,11 +1110,18 @@
mocs: kaudiorecordstream_p.moc
#>+ 3
@@ -3066,7 +3702,7 @@
#>+ 3
clean-closures:
-@@ -1117,7 +1120,7 @@
+@@ -1117,7 +1169,7 @@
#>+ 11
@@ -3075,7 +3711,7 @@
@echo 'creating libartskde_la.all_cc.cc ...'; \
rm -f libartskde_la.all_cc.files libartskde_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cc.final; \
-@@ -1129,7 +1132,7 @@
+@@ -1129,7 +1181,7 @@
rm -f libartskde_la.all_cc.final libartskde_la.all_cc.files
#>+ 11
@@ -3086,7 +3722,114 @@
echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cpp.final; \
--- arts/kde/mcop-dcop/Makefile.in
+++ arts/kde/mcop-dcop/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,10 @@
+
+
+
++#>- SOURCES = $(kmcop_la_SOURCES)
++#>+ 1
++SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,14 +61,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"
++am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -85,27 +82,32 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kmcop.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/mcopdcopobject.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kmcop.la.Po $(DEPDIR)/kmcop_dummy.Plo $(DEPDIR)/kmcop_skel.P $(DEPDIR)/libkdeinit_kmcop_la.all_cpp.P ./$(DEPDIR)/kmcop.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mcopdcopobject.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kmcop.la.Po $(DEPDIR)/kmcop_dummy.Plo $(DEPDIR)/kmcop_skel.P ./$(DEPDIR)/kmcop.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/mcopdcopobject.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(kmcop_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES)
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kmcop_la_SOURCES)
+ #>- DIST_SOURCES = $(kmcop_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES)
+@@ -129,6 +131,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -170,8 +174,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -248,7 +250,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -285,6 +286,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -3096,7 +3839,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -549,7 +552,7 @@
+@@ -340,6 +344,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -349,8 +354,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -368,6 +371,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -549,7 +553,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3105,7 +3873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +590,9 @@
+@@ -587,16 +591,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3117,9 +3885,204 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -604,8 +608,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -623,7 +627,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -631,8 +635,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -689,21 +693,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -720,7 +727,7 @@
+ test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -728,7 +735,7 @@
+ uninstall-kdelnkDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -836,7 +843,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- arts/knotify/Makefile.in
+++ arts/knotify/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -56,14 +58,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kdelnkdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -84,24 +79,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/knotify.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/knotify_la.all_cpp.P ./$(DEPDIR)/knotify.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/knotify_skel.P ./$(DEPDIR)/knotify.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
+ DIST_SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
+ kdelnkDATA_INSTALL = $(INSTALL_DATA)
+@@ -124,6 +126,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -165,8 +169,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -243,7 +245,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -280,6 +281,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -3129,7 +4092,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -335,6 +339,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,8 +349,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -363,6 +366,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -541,7 +545,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -3138,7 +4126,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,16 +583,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3150,9 +4138,164 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -596,8 +600,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -636,21 +640,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -667,7 +674,7 @@
+ test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -675,7 +682,7 @@
+ uninstall-kdelnkDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -782,7 +789,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- arts/message/Makefile.in
+++ arts/message/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(artsmessage_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -64,24 +66,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/artsmessage.Po
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/artsmessage.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(artsmessage_SOURCES)
+ DIST_SOURCES = $(artsmessage_SOURCES)
+ ETAGS = etags
+@@ -101,6 +106,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -142,8 +149,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -220,7 +225,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -257,6 +261,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -3162,7 +4305,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -312,6 +319,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -321,8 +329,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -340,6 +346,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -506,7 +513,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -3171,7 +4339,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -544,9 +551,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -3183,8 +4351,64 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -592,21 +599,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -720,7 +730,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- config.h.in
+++ config.h.in
+@@ -1,5 +1,8 @@
+ /* config.h.in. Generated from configure.in by autoheader. */
+
++/* Avahi API 0.6 */
++#undef AVAHI_API_0_6
++
+ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+ systems. This function is required for `alloca.c' support on those systems.
+ */
+@@ -94,9 +97,6 @@
+ /* Define if your system has Linux Directory Notification */
+ #undef HAVE_DNOTIFY
+
+-/* Define if dns-sd is available */
+-#undef HAVE_DNSSD
+-
+ /* Define if you have OpenEXR */
+ #undef HAVE_EXR
+
@@ -217,6 +217,9 @@
/* Define if you have the initgroups prototype */
#undef HAVE_INITGROUPS_PROTO
@@ -3254,11 +4478,22 @@
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS kde_libs_prefix kde_libs_htmldir CONF_FILES build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL MSGFMT GMSGFMT XGETTEXT ALLOCA ACL_LIBS LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QNAMESPACE_H LIBICE LIB_KIMGIO EXTRA_SUBDIRS HAVE_SENDFILE HAVE_MITSHM ICE_SUBDIR ICE_RLIB LIBUTEMPTER QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_VERSION_SCRIPT_TRUE include_VERSION_SCRIPT_FALSE MD5SUM LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE LUA LUA_INCLUDES LUA_LIBS LIB_IDN LIBART_LIBS LIBART_CFLAGS LIBART_RPATH include_SVGICONS_TRUE include_SVGICONS_FALSE KDE_FORCE_INLINE kde_cups_config include_cups_SUBDIR_TRUE include_cups_SUBDIR_FALSE LIB_CUPS cups_modeldir path_su LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH HELP_SUBDIR MEINPROC_DEP DOJAVA_TRUE DOJAVA_FALSE LIBTHAI KJAVA_POLICYPATH LIBTIFF LIB_JASPER PKG_CONFIG LIB_EXR EXR_FLAGS include_TIFF_MODULES_TRUE include_TIFF_MODULES_FALSE include_JP2_MODULES_TRUE include_JP2_MODULES_FALSE include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE KDEINIT_XFT_INCLUDES LIBFAM LIBVOLMGT SSL_INCLUDES SSL_LDFLAGS LIBSSL include_bzip2_TRUE include_bzip2_FALSE GSSAPI_INCS GSSAPI_LIBS GSSAPI_RPATH LIBPCRE PCRECFLAGS include_aspell_plugin_TRUE include_aspell_plugin_FALSE include_hspell_plugin_TRUE include_hspell_plugin_FALSE LIBASOUND undefined_symbols_allowed_TRUE undefined_symbols_allowed_FALSE TOPSUBDIRS dcop_SUBDIR_included_TRUE dcop_SUBDIR_included_FALSE libltdl_SUBDIR_included_TRUE libltdl_SUBDIR_included_FALSE kdefx_SUBDIR_included_TRUE kdefx_SUBDIR_included_FALSE kdecore_SUBDIR_included_TRUE kdecore_SUBDIR_included_FALSE kunittest_SUBDIR_included_TRUE kunittest_SUBDIR_included_FALSE kdeui_SUBDIR_included_TRUE kdeui_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kjs_SUBDIR_included_TRUE kjs_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE kio_SUBDIR_included_TRUE kio_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE dnssd_SUBDIR_included_TRUE dnssd_SUBDIR_included_FALSE kab_SUBDIR_included_TRUE kab_SUBDIR_included_FALSE kconf_update_SUBDIR_included_TRUE kconf_update_SUBDIR_included_FALSE kded_SUBDIR_included_TRUE kded_SUBDIR_included_FALSE kdoctools_SUBDIR_included_TRUE kdoctools_SUBDIR_included_FALSE kimgio_SUBDIR_included_TRUE kimgio_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE knewstuff_SUBDIR_included_TRUE knewstuff_SUBDIR_included_FALSE kparts_SUBDIR_included_TRUE kparts_SUBDIR_included_FALSE kresources_SUBDIR_included_TRUE kresources_SUBDIR_included_FALSE kstyles_SUBDIR_included_TRUE kstyles_SUBDIR_included_FALSE kutils_SUBDIR_included_TRUE kutils_SUBDIR_included_FALSE libkmid_SUBDIR_included_TRUE libkmid_SUBDIR_included_FALSE libkscreensaver_SUBDIR_included_TRUE libkscreensaver_SUBDIR_included_FALSE licenses_SUBDIR_included_TRUE licenses_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcert_SUBDIR_included_TRUE kcert_SUBDIR_included_FALSE kinit_SUBDIR_included_TRUE kinit_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kabc_SUBDIR_included_TRUE kabc_SUBDIR_included_FALSE kspell2_SUBDIR_included_TRUE kspell2_SUBDIR_included_FALSE kmdi_SUBDIR_included_TRUE kmdi_SUBDIR_included_FALSE kcmshell_SUBDIR_included_TRUE kcmshell_SUBDIR_included_FALSE khtml_SUBDIR_included_TRUE khtml_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE kdewidgets_SUBDIR_included_TRUE kdewidgets_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS kde_libs_prefix kde_libs_htmldir CONF_FILES build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL MSGFMT GMSGFMT XGETTEXT ALLOCA ACL_LIBS LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QNAMESPACE_H LIBICE LIB_KIMGIO EXTRA_SUBDIRS HAVE_SENDFILE HAVE_MITSHM ICE_SUBDIR ICE_RLIB LIBUTEMPTER QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_VERSION_SCRIPT_TRUE include_VERSION_SCRIPT_FALSE MD5SUM LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE LUA LUA_INCLUDES LUA_LIBS LIB_IDN LIBART_LIBS LIBART_CFLAGS LIBART_RPATH include_SVGICONS_TRUE include_SVGICONS_FALSE KDE_FORCE_INLINE kde_cups_config include_cups_SUBDIR_TRUE include_cups_SUBDIR_FALSE LIB_CUPS cups_modeldir path_su LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH HELP_SUBDIR MEINPROC_DEP DOJAVA_TRUE DOJAVA_FALSE LIBTHAI KJAVA_POLICYPATH LIBTIFF LIB_JASPER PKG_CONFIG LIB_EXR EXR_FLAGS include_TIFF_MODULES_TRUE include_TIFF_MODULES_FALSE include_JP2_MODULES_TRUE include_JP2_MODULES_FALSE include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE KDEINIT_XFT_INCLUDES LIBFAM LIBVOLMGT SSL_INCLUDES SSL_LDFLAGS LIBSSL include_bzip2_TRUE include_bzip2_FALSE GSSAPI_INCS GSSAPI_LIBS GSSAPI_RPATH LIBPCRE PCRECFLAGS include_aspell_plugin_TRUE include_aspell_plugin_FALSE include_hspell_plugin_TRUE include_hspell_plugin_FALSE LIBASOUND undefined_symbols_allowed_TRUE undefined_symbols_allowed_FALSE TOPSUBDIRS dcop_SUBDIR_included_TRUE dcop_SUBDIR_included_FALSE libltdl_SUBDIR_included_TRUE libltdl_SUBDIR_included_FALSE kdefx_SUBDIR_included_TRUE kdefx_SUBDIR_included_FALSE kdecore_SUBDIR_included_TRUE kdecore_SUBDIR_included_FALSE kunittest_SUBDIR_included_TRUE kunittest_SUBDIR_included_FALSE kdeui_SUBDIR_included_TRUE kdeui_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kjs_SUBDIR_included_TRUE kjs_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE kio_SUBDIR_included_TRUE kio_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE dnssd_SUBDIR_included_TRUE dnssd_SUBDIR_included_FALSE kab_SUBDIR_included_TRUE kab_SUBDIR_included_FALSE kconf_update_SUBDIR_included_TRUE kconf_update_SUBDIR_included_FALSE kded_SUBDIR_included_TRUE kded_SUBDIR_included_FALSE kdoctools_SUBDIR_included_TRUE kdoctools_SUBDIR_included_FALSE kimgio_SUBDIR_included_TRUE kimgio_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE knewstuff_SUBDIR_included_TRUE knewstuff_SUBDIR_included_FALSE kparts_SUBDIR_included_TRUE kparts_SUBDIR_included_FALSE kresources_SUBDIR_included_TRUE kresources_SUBDIR_included_FALSE kstyles_SUBDIR_included_TRUE kstyles_SUBDIR_included_FALSE kutils_SUBDIR_included_TRUE kutils_SUBDIR_included_FALSE libkmid_SUBDIR_included_TRUE libkmid_SUBDIR_included_FALSE libkscreensaver_SUBDIR_included_TRUE libkscreensaver_SUBDIR_included_FALSE licenses_SUBDIR_included_TRUE licenses_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcert_SUBDIR_included_TRUE kcert_SUBDIR_included_FALSE kinit_SUBDIR_included_TRUE kinit_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kabc_SUBDIR_included_TRUE kabc_SUBDIR_included_FALSE kspell2_SUBDIR_included_TRUE kspell2_SUBDIR_included_FALSE kmdi_SUBDIR_included_TRUE kmdi_SUBDIR_included_FALSE kcmshell_SUBDIR_included_TRUE kcmshell_SUBDIR_included_FALSE khtml_SUBDIR_included_TRUE khtml_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE kdewidgets_SUBDIR_included_TRUE kdewidgets_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS kde_libs_prefix kde_libs_htmldir CONF_FILES build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL MSGFMT GMSGFMT XGETTEXT ALLOCA ACL_LIBS LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM QNAMESPACE_H LIBICE LIB_KIMGIO EXTRA_SUBDIRS HAVE_SENDFILE HAVE_MITSHM ICE_SUBDIR ICE_RLIB LIBUTEMPTER QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN include_VERSION_SCRIPT_TRUE include_VERSION_SCRIPT_FALSE MD5SUM have_pkg_config PKG_CONFIG ac_pt_PKG_CONFIG AVAHI_CFLAGS AVAHI_LIBS LUA LUA_INCLUDES LUA_LIBS LIB_IDN LIBART_LIBS LIBART_CFLAGS LIBART_RPATH include_SVGICONS_TRUE include_SVGICONS_FALSE KDE_FORCE_INLINE kde_cups_config include_cups_SUBDIR_TRUE include_cups_SUBDIR_FALSE LIB_CUPS cups_modeldir path_su LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIBXSLT_LIBS LIBXSLT_CFLAGS LIBXSLT_RPATH LIBXML_LIBS LIBXML_CFLAGS LIBXML_RPATH HELP_SUBDIR MEINPROC_DEP DOJAVA_TRUE DOJAVA_FALSE LIBTHAI KJAVA_POLICYPATH LIBTIFF LIB_JASPER LIB_EXR EXR_FLAGS include_TIFF_MODULES_TRUE include_TIFF_MODULES_FALSE include_JP2_MODULES_TRUE include_JP2_MODULES_FALSE include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE KDEINIT_XFT_INCLUDES LIBFAM LIBVOLMGT SSL_INCLUDES SSL_LDFLAGS LIBSSL include_bzip2_TRUE include_bzip2_FALSE GSSAPI_INCS GSSAPI_LIBS GSSAPI_RPATH LIBPCRE PCRECFLAGS include_aspell_plugin_TRUE include_aspell_plugin_FALSE include_hspell_plugin_TRUE include_hspell_plugin_FALSE LIBASOUND undefined_symbols_allowed_TRUE undefined_symbols_allowed_FALSE TOPSUBDIRS dcop_SUBDIR_included_TRUE dcop_SUBDIR_included_FALSE libltdl_SUBDIR_included_TRUE libltdl_SUBDIR_included_FALSE kdefx_SUBDIR_included_TRUE kdefx_SUBDIR_included_FALSE kdecore_SUBDIR_included_TRUE kdecore_SUBDIR_included_FALSE kunittest_SUBDIR_included_TRUE kunittest_SUBDIR_included_FALSE kdeui_SUBDIR_included_TRUE kdeui_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kjs_SUBDIR_included_TRUE kjs_SUBDIR_included_FALSE kwallet_SUBDIR_included_TRUE kwallet_SUBDIR_included_FALSE kio_SUBDIR_included_TRUE kio_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE dnssd_SUBDIR_included_TRUE dnssd_SUBDIR_included_FALSE kab_SUBDIR_included_TRUE kab_SUBDIR_included_FALSE kconf_update_SUBDIR_included_TRUE kconf_update_SUBDIR_included_FALSE kded_SUBDIR_included_TRUE kded_SUBDIR_included_FALSE kdoctools_SUBDIR_included_TRUE kdoctools_SUBDIR_included_FALSE kimgio_SUBDIR_included_TRUE kimgio_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE knewstuff_SUBDIR_included_TRUE knewstuff_SUBDIR_included_FALSE kparts_SUBDIR_included_TRUE kparts_SUBDIR_included_FALSE kresources_SUBDIR_included_TRUE kresources_SUBDIR_included_FALSE kstyles_SUBDIR_included_TRUE kstyles_SUBDIR_included_FALSE kutils_SUBDIR_included_TRUE kutils_SUBDIR_included_FALSE libkmid_SUBDIR_included_TRUE libkmid_SUBDIR_included_FALSE libkscreensaver_SUBDIR_included_TRUE libkscreensaver_SUBDIR_included_FALSE licenses_SUBDIR_included_TRUE licenses_SUBDIR_included_FALSE mimetypes_SUBDIR_included_TRUE mimetypes_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kcert_SUBDIR_included_TRUE kcert_SUBDIR_included_FALSE kinit_SUBDIR_included_TRUE kinit_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kabc_SUBDIR_included_TRUE kabc_SUBDIR_included_FALSE kspell2_SUBDIR_included_TRUE kspell2_SUBDIR_included_FALSE kmdi_SUBDIR_included_TRUE kmdi_SUBDIR_included_FALSE kcmshell_SUBDIR_included_TRUE kcmshell_SUBDIR_included_FALSE khtml_SUBDIR_included_TRUE khtml_SUBDIR_included_FALSE interfaces_SUBDIR_included_TRUE interfaces_SUBDIR_included_FALSE kdewidgets_SUBDIR_included_TRUE kdewidgets_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
-@@ -1026,6 +1026,8 @@
+@@ -945,6 +945,10 @@
+ ac_env_FFLAGS_value=$FFLAGS
+ ac_cv_env_FFLAGS_set=${FFLAGS+set}
+ ac_cv_env_FFLAGS_value=$FFLAGS
++ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
++ac_env_PKG_CONFIG_value=$PKG_CONFIG
++ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
++ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
+
+ #
+ # Report the --help message.
+@@ -1026,6 +1030,8 @@
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-fast-perl disable fast Makefile generation (needs perl)
@@ -3267,7 +4502,13 @@
--enable-debug=ARG enables debug symbols (yes|no|full) default=no
--disable-debug disables debug output and debug symbols default=no
--enable-strict compiles with strict compiler options (may not
-@@ -1068,6 +1070,7 @@
+@@ -1062,12 +1068,12 @@
+ toolchain hidden visibility default=no
+ --enable-sendfile enable the use of sendfile() (Linux only)
+ --enable-mitshm use MIT-SHM for pixmap loading/saving
+- --disable-dnssd don't require libdns_sd (browsing and publishing DNS-SD services will not be possible)
+ --disable-openpty disable openpty (UNIX98 terminals) support default=enabled
+ --enable-fast-malloc Use own malloc implementation : yes,no,full,debug
--disable-cups disable CUPS support default=auto
--disable-libfam don't search for libfam and do not use it
--enable-dnotify enable use of Linux directory notifications
@@ -3275,7 +4516,15 @@
--disable-pcre don't require libpcre (poor RegExp support in
Javascript)
-@@ -1213,7 +1216,7 @@
+@@ -1121,6 +1127,7 @@
+ CXXCPP C++ preprocessor
+ F77 Fortran 77 compiler command
+ FFLAGS Fortran 77 compiler flags
++ PKG_CONFIG path to pkg-config utility
+
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -1213,7 +1220,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
@@ -3284,10 +4533,63 @@
done
fi
-@@ -2155,6 +2158,31 @@
+@@ -1723,7 +1730,7 @@
+ rm conftest.sed
+-am__api_version="1.9"
++am__api_version="1.8"
+
+ test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
+@@ -1895,21 +1902,13 @@
+ fi
+
+ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+- # We used to keeping the `.' as first argument, in order to
+- # allow $(mkdir_p) to be used without argument. As in
++ # Keeping the `.' argument allows $(mkdir_p) to be used without
++ # argument. Indeed, we sometimes output rules like
+ # $(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 --'
++ # where $(somedir) is conditionally defined.
++ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
++ # expensive solution, as it forces Make to start a sub-shell.)
++ mkdir_p='mkdir -p -- .'
+ else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+@@ -2053,6 +2052,9 @@
+
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
++
++AMTAR=${AMTAR-"${am_missing_run}tar"}
++
+ install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+ # Installed binaries are usually stripped using `strip' when the user
+@@ -2145,13 +2147,31 @@
+
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+-# Always define AMTAR for backward compatibility.
+
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -3308,15 +4610,12 @@
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
-+
+
+ MAINT=$MAINTAINER_MODE_TRUE
-+
-+
-+
- # Find a good install program. We prefer a C program (faster),
- # so one script is as good as another. But avoid the broken or
- # incompatible versions:
-@@ -2947,8 +2975,7 @@
+
+
+
+@@ -2947,8 +2967,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3326,7 +4625,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3006,8 +3033,7 @@
+@@ -3006,8 +3025,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3336,7 +4635,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3123,8 +3149,7 @@
+@@ -3123,8 +3141,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3346,7 +4645,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3178,8 +3203,7 @@
+@@ -3178,8 +3195,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3356,7 +4655,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3224,8 +3248,7 @@
+@@ -3224,8 +3240,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3366,7 +4665,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3269,8 +3292,7 @@
+@@ -3269,8 +3284,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3376,7 +4675,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3827,8 +3849,7 @@
+@@ -3827,8 +3841,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3386,7 +4685,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3886,8 +3907,7 @@
+@@ -3886,8 +3899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3396,7 +4695,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -3958,8 +3978,7 @@
+@@ -3958,8 +3970,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3406,7 +4705,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4003,8 +4022,7 @@
+@@ -4003,8 +4014,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3416,7 +4715,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4182,8 +4200,7 @@
+@@ -4182,8 +4192,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3426,7 +4725,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4294,8 +4311,7 @@
+@@ -4294,8 +4303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3436,7 +4735,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4383,8 +4399,7 @@
+@@ -4383,8 +4391,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3446,7 +4745,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4486,8 +4501,7 @@
+@@ -4486,8 +4493,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3456,7 +4755,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4586,8 +4600,7 @@
+@@ -4586,8 +4592,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3466,7 +4765,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4671,8 +4684,7 @@
+@@ -4671,8 +4676,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3476,7 +4775,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4761,8 +4773,7 @@
+@@ -4761,8 +4765,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3486,7 +4785,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4849,8 +4860,7 @@
+@@ -4849,8 +4852,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3496,7 +4795,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4937,8 +4947,7 @@
+@@ -4937,8 +4939,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3506,7 +4805,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5044,8 +5053,7 @@
+@@ -5044,8 +5045,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3516,7 +4815,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5132,8 +5140,7 @@
+@@ -5132,8 +5132,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3526,7 +4825,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5220,8 +5227,7 @@
+@@ -5220,8 +5219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3536,7 +4835,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5308,8 +5314,7 @@
+@@ -5308,8 +5306,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3546,7 +4845,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5440,8 +5445,7 @@
+@@ -5440,8 +5437,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3556,7 +4855,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5529,8 +5533,7 @@
+@@ -5529,8 +5525,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3566,7 +4865,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5617,8 +5620,7 @@
+@@ -5617,8 +5612,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3576,7 +4875,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5705,8 +5707,7 @@
+@@ -5705,8 +5699,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3586,7 +4885,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5793,8 +5794,7 @@
+@@ -5793,8 +5786,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3596,7 +4895,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5881,8 +5881,7 @@
+@@ -5881,8 +5873,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3606,7 +4905,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6305,8 +6304,7 @@
+@@ -6305,8 +6296,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3616,7 +4915,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6432,8 +6430,7 @@
+@@ -6432,8 +6422,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3626,7 +4925,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6521,8 +6518,7 @@
+@@ -6521,8 +6510,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -3636,7 +4935,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6605,185 +6601,6 @@
+@@ -6605,185 +6593,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -3822,7 +5121,7 @@
fi
-@@ -6960,7 +6777,7 @@
+@@ -6960,7 +6769,7 @@
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -3831,7 +5130,7 @@
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7065,7 +6882,7 @@
+@@ -7065,7 +6874,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -3840,7 +5139,7 @@
# 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'*)
-@@ -7099,7 +6916,7 @@
+@@ -7099,7 +6908,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -3849,7 +5148,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -7129,6 +6946,15 @@
+@@ -7129,6 +6938,15 @@
*) reload_flag=" $reload_flag" ;;
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3865,7 +5164,7 @@
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7215,44 +7041,36 @@
+@@ -7215,44 +7033,36 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3920,7 +5219,7 @@
lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
;;
-@@ -7268,7 +7086,7 @@
+@@ -7268,7 +7078,7 @@
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
@@ -3929,7 +5228,7 @@
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
-@@ -7285,42 +7103,21 @@
+@@ -7285,42 +7095,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -3979,7 +5278,7 @@
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
-@@ -7339,19 +7136,14 @@
+@@ -7339,19 +7128,14 @@
;;
openbsd*)
@@ -4001,7 +5300,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7361,7 +7153,6 @@
+@@ -7361,7 +7145,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -4009,16 +5308,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7438,7 +7229,7 @@
+@@ -7438,7 +7221,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7441 "configure"' > conftest.$ac_ext
-+ echo '#line 7232 "configure"' > conftest.$ac_ext
++ echo '#line 7224 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7481,14 +7272,13 @@
+@@ -7481,14 +7264,13 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -4035,7 +5334,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7500,7 +7290,6 @@
+@@ -7500,7 +7282,6 @@
esac
;;
*64-bit*)
@@ -4043,7 +5342,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7560,8 +7349,7 @@
+@@ -7560,8 +7341,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4053,7 +5352,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7636,8 +7424,7 @@
+@@ -7636,8 +7416,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4063,7 +5362,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7807,8 +7594,7 @@
+@@ -7807,8 +7586,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4073,7 +5372,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7875,8 +7661,7 @@
+@@ -7875,8 +7653,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4083,7 +5382,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7991,6 +7776,243 @@
+@@ -7991,6 +7768,243 @@
done
@@ -4327,16 +5626,16 @@
ac_ext=f
ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8083,7 +8105,7 @@
+@@ -8083,7 +8097,7 @@
# Provide some information about the compiler.
-echo "$as_me:8086:" \
-+echo "$as_me:8108:" \
++echo "$as_me:8100:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8129,8 +8151,7 @@
+@@ -8129,8 +8143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4346,7 +5645,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8179,8 +8200,7 @@
+@@ -8179,8 +8192,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -4356,7 +5655,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8238,7 +8258,7 @@
+@@ -8238,7 +8250,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -4365,7 +5664,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8267,20 +8287,53 @@
+@@ -8267,20 +8279,53 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -4425,7 +5724,7 @@
# 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.
-@@ -8317,9 +8370,6 @@
+@@ -8317,9 +8362,6 @@
# Regexp to match symbols that can be accessed directly from C.
sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
@@ -4435,7 +5734,7 @@
# 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'"
-@@ -8341,6 +8391,13 @@
+@@ -8341,6 +8383,13 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -4449,7 +5748,7 @@
irix* | nonstopux*)
symcode='[BCDEGRST]'
;;
-@@ -8348,7 +8405,7 @@
+@@ -8348,7 +8397,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -4458,7 +5757,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8366,14 +8423,17 @@
+@@ -8366,14 +8415,17 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -4478,7 +5777,7 @@
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -8535,7 +8595,7 @@
+@@ -8535,7 +8587,7 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -4487,7 +5786,7 @@
sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-@@ -8555,7 +8615,7 @@
+@@ -8555,7 +8607,7 @@
default_ofile=libtool
can_build_shared=yes
@@ -4496,7 +5795,7 @@
# which needs '.lib').
libext=a
ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8840,6 +8900,17 @@
+@@ -8840,6 +8892,17 @@
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
fi
@@ -4514,7 +5813,7 @@
# Only perform the check for file, if the check method requires it
case $deplibs_check_method in
file_magic*)
-@@ -8865,7 +8936,7 @@
+@@ -8865,7 +8928,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4523,7 +5822,7 @@
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
-@@ -8927,7 +8998,7 @@
+@@ -8927,7 +8990,7 @@
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
@@ -4532,7 +5831,7 @@
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
-@@ -9026,6 +9097,20 @@
+@@ -9026,6 +9089,20 @@
compiler=$CC
@@ -4553,7 +5852,7 @@
#
# Check for any special shared library compilation flags.
#
-@@ -9062,11 +9147,16 @@
+@@ -9062,11 +9139,16 @@
LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
printf "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -4571,7 +5870,7 @@
else
lt_prog_compiler_static_works=yes
fi
-@@ -9112,18 +9202,20 @@
+@@ -9112,18 +9194,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -4580,12 +5879,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9118: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9208: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9200: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9122: \$? = $ac_status" >&5
-+ echo "$as_me:9212: \$? = $ac_status" >&5
++ echo "$as_me:9204: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -4597,7 +5896,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -9200,7 +9292,7 @@
+@@ -9200,7 +9284,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4606,7 +5905,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9226,6 +9318,16 @@
+@@ -9226,6 +9310,16 @@
lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -4623,7 +5922,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -9237,7 +9339,7 @@
+@@ -9237,7 +9331,7 @@
lt_prog_compiler_wl='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -4632,7 +5931,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -9261,12 +9363,19 @@
+@@ -9261,12 +9355,19 @@
;;
linux*)
@@ -4653,7 +5952,7 @@
ccc*)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
-@@ -9287,9 +9396,14 @@
+@@ -9287,9 +9388,14 @@
;;
solaris*)
@@ -4669,7 +5968,7 @@
;;
sunos4*)
-@@ -9311,6 +9425,11 @@
+@@ -9311,6 +9417,11 @@
fi
;;
@@ -4681,7 +5980,7 @@
uts4*)
lt_prog_compiler_pic='-pic'
lt_prog_compiler_static='-Bstatic'
-@@ -9345,18 +9464,20 @@
+@@ -9345,18 +9456,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -4690,12 +5989,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9351: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9470: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9462: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9355: \$? = $ac_status" >&5
-+ echo "$as_me:9474: \$? = $ac_status" >&5
++ echo "$as_me:9466: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -4707,7 +6006,7 @@
lt_prog_compiler_pic_works=yes
fi
fi
-@@ -9377,7 +9498,7 @@
+@@ -9377,7 +9490,7 @@
fi
fi
@@ -4716,7 +6015,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic=
-@@ -9399,38 +9520,36 @@
+@@ -9399,38 +9512,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -4738,12 +6037,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9418: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9532: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9524: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9422: \$? = $ac_status" >&5
-+ echo "$as_me:9536: \$? = $ac_status" >&5
++ echo "$as_me:9528: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -4767,7 +6066,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9501,6 +9620,16 @@
+@@ -9501,6 +9612,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -4784,7 +6083,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -9521,6 +9650,27 @@
+@@ -9521,6 +9642,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -4812,7 +6111,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -9558,7 +9708,7 @@
+@@ -9558,7 +9700,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -4821,7 +6120,7 @@
else
ld_shlibs=no
fi
-@@ -9568,13 +9718,13 @@
+@@ -9568,13 +9710,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -4838,7 +6137,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9583,19 +9733,51 @@
+@@ -9583,19 +9725,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -4894,7 +6193,7 @@
fi
;;
-@@ -9613,8 +9795,8 @@
+@@ -9613,8 +9787,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4905,7 +6204,7 @@
else
ld_shlibs=no
fi
-@@ -9629,24 +9811,19 @@
+@@ -9629,24 +9803,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4937,7 +6236,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9680,9 +9857,20 @@
+@@ -9680,9 +9849,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -4960,7 +6259,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9699,7 +9887,7 @@
+@@ -9699,7 +9879,7 @@
link_all_deplibs=yes
if test "$GCC" = yes; then
@@ -4969,7 +6268,7 @@
# 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`
-@@ -9720,6 +9908,9 @@
+@@ -9720,6 +9900,9 @@
fi
esac
shared_flag='-shared'
@@ -4979,7 +6278,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9728,21 +9919,22 @@
+@@ -9728,21 +9911,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -5007,7 +6306,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9766,8 +9958,7 @@
+@@ -9766,8 +9950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5017,7 +6316,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9794,14 +9985,13 @@
+@@ -9794,14 +9977,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -5035,7 +6334,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9828,8 +10018,7 @@
+@@ -9828,8 +10010,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5045,7 +6344,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9866,8 +10055,8 @@
+@@ -9866,8 +10047,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
@@ -5056,7 +6355,7 @@
fi
fi
;;
-@@ -9880,7 +10069,7 @@
+@@ -9880,7 +10061,7 @@
ld_shlibs=no
;;
@@ -5065,7 +6364,7 @@
export_dynamic_flag_spec=-rdynamic
;;
-@@ -9890,13 +10079,13 @@
+@@ -9890,13 +10071,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -5082,7 +6381,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9906,52 +10095,52 @@
+@@ -9906,52 +10087,52 @@
;;
darwin* | rhapsody*)
@@ -5175,7 +6474,7 @@
fi
;;
-@@ -9985,8 +10174,8 @@
+@@ -9985,8 +10166,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5186,7 +6485,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9994,7 +10183,7 @@
+@@ -9994,7 +10175,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -5195,7 +6494,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -10010,16 +10199,16 @@
+@@ -10010,16 +10191,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -5216,7 +6515,7 @@
hppa*64*|ia64*)
archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -10029,7 +10218,7 @@
+@@ -10029,7 +10210,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -5225,7 +6524,7 @@
hppa*64*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10062,7 +10251,7 @@
+@@ -10062,7 +10243,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -5234,7 +6533,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10072,7 +10261,7 @@
+@@ -10072,7 +10253,7 @@
link_all_deplibs=yes
;;
@@ -5243,7 +6542,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10095,7 +10284,8 @@
+@@ -10095,7 +10276,8 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -5253,7 +6552,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10105,7 +10295,7 @@
+@@ -10105,7 +10287,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -5262,7 +6561,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10116,14 +10306,14 @@
+@@ -10116,14 +10298,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -5279,7 +6578,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10135,13 +10325,13 @@
+@@ -10135,13 +10317,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5295,7 +6594,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10160,10 +10350,12 @@
+@@ -10160,10 +10342,12 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -5310,7 +6609,7 @@
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10172,8 +10364,18 @@
+@@ -10172,8 +10356,18 @@
hardcode_shlibpath_var=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5331,7 +6630,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10182,7 +10384,7 @@
+@@ -10182,7 +10376,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -5340,7 +6639,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10242,9 +10444,9 @@
+@@ -10242,9 +10436,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -5352,7 +6651,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10350,7 +10552,7 @@
+@@ -10350,7 +10544,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -5361,7 +6660,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10360,7 +10562,20 @@
+@@ -10360,7 +10554,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5383,7 +6682,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10425,7 +10640,7 @@
+@@ -10425,7 +10632,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5392,7 +6691,7 @@
;;
beos*)
-@@ -10434,7 +10649,7 @@
+@@ -10434,7 +10641,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -5401,7 +6700,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10450,7 +10665,7 @@
+@@ -10450,7 +10657,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -5410,7 +6709,7 @@
need_version=no
need_lib_prefix=no
-@@ -10462,7 +10677,8 @@
+@@ -10462,7 +10669,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -5420,7 +6719,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -10492,7 +10708,7 @@
+@@ -10492,7 +10700,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5429,7 +6728,7 @@
;;
esac
;;
-@@ -10515,7 +10731,7 @@
+@@ -10515,7 +10723,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -5438,7 +6737,7 @@
# 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"`
-@@ -10538,7 +10754,7 @@
+@@ -10538,7 +10746,7 @@
dynamic_linker=no
;;
@@ -5447,7 +6746,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10550,8 +10766,17 @@
+@@ -10550,8 +10758,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -5467,7 +6766,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -10569,7 +10794,7 @@
+@@ -10569,7 +10786,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -5476,7 +6775,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10596,9 +10821,9 @@
+@@ -10596,9 +10813,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -5488,7 +6787,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10613,7 +10838,7 @@
+@@ -10613,7 +10830,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -5497,7 +6796,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10624,7 +10849,7 @@
+@@ -10624,7 +10841,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -5506,7 +6805,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10686,22 +10911,19 @@
+@@ -10686,22 +10903,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -5535,7 +6834,7 @@
# 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,
-@@ -10711,6 +10933,30 @@
+@@ -10711,6 +10925,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5566,7 +6865,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10720,7 +10966,7 @@
+@@ -10720,7 +10958,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -5575,7 +6874,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10749,7 +10995,11 @@
+@@ -10749,7 +10987,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -5588,7 +6887,7 @@
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
-@@ -10769,7 +11019,7 @@
+@@ -10769,7 +11011,7 @@
os2*)
libname_spec='$name'
@@ -5597,7 +6896,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10871,8 +11121,8 @@
+@@ -10871,8 +11113,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
@@ -5608,7 +6907,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct" != no &&
-@@ -10998,8 +11248,7 @@
+@@ -10998,8 +11240,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5618,7 +6917,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11102,8 +11351,7 @@
+@@ -11102,8 +11343,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5628,7 +6927,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11168,8 +11416,7 @@
+@@ -11168,8 +11408,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5638,7 +6937,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11262,8 +11509,7 @@
+@@ -11262,8 +11501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5648,7 +6947,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11328,8 +11574,7 @@
+@@ -11328,8 +11566,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5658,7 +6957,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11395,8 +11640,7 @@
+@@ -11395,8 +11632,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5668,7 +6967,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11462,8 +11706,7 @@
+@@ -11462,8 +11698,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5678,16 +6977,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11538,7 +11781,7 @@
+@@ -11538,7 +11773,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11541 "configure"
-+#line 11784 "configure"
++#line 11776 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11604,7 +11847,7 @@
+@@ -11604,7 +11839,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5696,16 +6995,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11636,7 +11879,7 @@
+@@ -11636,7 +11871,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11639 "configure"
-+#line 11882 "configure"
++#line 11874 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11702,7 +11945,7 @@
+@@ -11702,7 +11937,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5714,7 +7013,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11752,7 +11995,7 @@
+@@ -11752,7 +11987,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -5723,7 +7022,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -11761,47 +12004,10 @@
+@@ -11761,47 +11996,10 @@
fi
;;
@@ -5772,7 +7071,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11827,7 +12033,8 @@
+@@ -11827,7 +12025,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -5782,7 +7081,7 @@
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 \
-@@ -11941,11 +12148,11 @@
+@@ -11941,11 +12140,11 @@
SED=$lt_SED
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5796,7 +7095,7 @@
# The names of the tagged configurations supported by this script.
available_tags=
-@@ -11975,6 +12182,12 @@
+@@ -11975,6 +12174,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -5809,7 +7108,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -12005,7 +12218,7 @@
+@@ -12005,7 +12210,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -5818,7 +7117,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12036,7 +12249,7 @@
+@@ -12036,7 +12241,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -5827,7 +7126,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12051,7 +12264,7 @@
+@@ -12051,7 +12256,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o
@@ -5836,7 +7135,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -12278,7 +12491,10 @@
+@@ -12278,7 +12483,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -5848,7 +7147,7 @@
fi
-@@ -12343,7 +12559,9 @@
+@@ -12343,7 +12551,9 @@
case $tagname in
CXX)
@@ -5859,7 +7158,7 @@
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12380,7 +12598,7 @@
+@@ -12380,7 +12590,7 @@
compiler_lib_search_path_CXX=
# Source file extension for C++ test sources.
@@ -5868,7 +7167,7 @@
# Object file extension for compiled C++ test sources.
objext=o
-@@ -12401,6 +12619,20 @@
+@@ -12401,6 +12611,20 @@
compiler=$CC
@@ -5889,7 +7188,7 @@
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
lt_save_LD=$LD
-@@ -12422,7 +12654,16 @@
+@@ -12422,7 +12646,16 @@
CC=${CXX-"c++"}
compiler=$CC
compiler_CXX=$CC
@@ -5907,7 +7206,7 @@
# We don't want -fno-exception wen compiling C++ code, so set the
# no_builtin_flag separately
-@@ -12493,7 +12734,7 @@
+@@ -12493,7 +12726,7 @@
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
lt_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
@@ -5916,7 +7215,7 @@
# 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'*)
-@@ -12527,7 +12768,7 @@
+@@ -12527,7 +12760,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -5925,7 +7224,7 @@
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
-@@ -12546,8 +12787,8 @@
+@@ -12546,8 +12779,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -5936,7 +7235,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12573,7 +12814,7 @@
+@@ -12573,7 +12806,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -5945,7 +7244,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12604,8 +12845,22 @@
+@@ -12604,8 +12837,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -5970,7 +7269,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12622,7 +12877,7 @@
+@@ -12622,7 +12869,7 @@
link_all_deplibs_CXX=yes
if test "$GXX" = yes; then
@@ -5979,7 +7278,7 @@
# 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`
-@@ -12643,6 +12898,9 @@
+@@ -12643,6 +12890,9 @@
fi
esac
shared_flag='-shared'
@@ -5989,7 +7288,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12651,15 +12909,16 @@
+@@ -12651,15 +12901,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -6010,7 +7309,7 @@
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.
-@@ -12689,8 +12948,7 @@
+@@ -12689,8 +12940,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6020,7 +7319,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12719,13 +12977,12 @@
+@@ -12719,13 +12969,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6036,7 +7335,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12752,8 +13009,7 @@
+@@ -12752,8 +13001,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6046,7 +7345,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12790,8 +13046,8 @@
+@@ -12790,8 +13038,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
@@ -6057,7 +7356,7 @@
fi
fi
;;
-@@ -12804,16 +13060,17 @@
+@@ -12804,16 +13052,17 @@
esac
;;
@@ -6077,7 +7376,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12822,70 +13079,81 @@
+@@ -12822,70 +13071,81 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6211,7 +7510,7 @@
# Green Hills C++ Compiler
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12896,14 +13164,14 @@
+@@ -12896,14 +13156,14 @@
;;
esac
;;
@@ -6228,7 +7527,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12920,12 +13188,12 @@
+@@ -12920,12 +13180,12 @@
# location of the library.
case $cc_basename in
@@ -6244,7 +7543,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12934,11 +13202,11 @@
+@@ -12934,11 +13194,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -6258,7 +7557,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12948,7 +13216,7 @@
+@@ -12948,7 +13208,7 @@
;;
hpux10*|hpux11*)
if test $with_gnu_ld = no; then
@@ -6267,7 +7566,7 @@
hppa*64*)
hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12964,7 +13232,7 @@
+@@ -12964,7 +13224,7 @@
;;
esac
fi
@@ -6276,7 +7575,7 @@
hppa*64*)
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
-@@ -12985,17 +13253,17 @@
+@@ -12985,17 +13245,17 @@
esac
case $cc_basename in
@@ -6298,7 +7597,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13011,12 +13279,12 @@
+@@ -13011,12 +13271,12 @@
*)
if test "$GXX" = yes; then
if test $with_gnu_ld = no; then
@@ -6313,7 +7612,7 @@
;;
esac
fi
-@@ -13029,9 +13297,9 @@
+@@ -13029,9 +13289,9 @@
;;
irix5* | irix6*)
case $cc_basename in
@@ -6325,7 +7624,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13042,9 +13310,9 @@
+@@ -13042,9 +13302,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -6337,7 +7636,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13055,14 +13323,14 @@
+@@ -13055,14 +13315,14 @@
;;
linux*)
case $cc_basename in
@@ -6355,7 +7654,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13080,20 +13348,44 @@
+@@ -13080,20 +13340,44 @@
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6406,7 +7705,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13121,7 +13413,7 @@
+@@ -13121,7 +13405,7 @@
;;
mvs*)
case $cc_basename in
@@ -6415,7 +7714,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13131,7 +13423,7 @@
+@@ -13131,7 +13415,7 @@
;;
esac
;;
@@ -6424,7 +7723,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13142,15 +13434,31 @@
+@@ -13142,15 +13426,31 @@
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
@@ -6458,7 +7757,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13160,14 +13468,14 @@
+@@ -13160,14 +13460,14 @@
old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
;;
@@ -6476,7 +7775,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13185,7 +13493,7 @@
+@@ -13185,7 +13485,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6485,7 +7784,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13204,13 +13512,13 @@
+@@ -13204,13 +13504,13 @@
;;
osf4* | osf5*)
case $cc_basename in
@@ -6501,7 +7800,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13219,17 +13527,17 @@
+@@ -13219,17 +13519,17 @@
# the KAI C++ compiler.
old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
;;
@@ -6523,7 +7822,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13248,7 +13556,7 @@
+@@ -13248,7 +13548,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6532,7 +7831,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13272,7 +13580,7 @@
+@@ -13272,7 +13572,7 @@
sco*)
archive_cmds_need_lc_CXX=no
case $cc_basename in
@@ -6541,7 +7840,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
-@@ -13284,12 +13592,12 @@
+@@ -13284,12 +13584,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6556,7 +7855,7 @@
# Lucid
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13302,36 +13610,33 @@
+@@ -13302,36 +13602,33 @@
;;
solaris*)
case $cc_basename in
@@ -6605,7 +7904,7 @@
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -13339,9 +13644,9 @@
+@@ -13339,9 +13636,9 @@
# in the archive.
old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
;;
@@ -6617,7 +7916,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13351,9 +13656,9 @@
+@@ -13351,9 +13648,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -6629,7 +7928,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13362,9 +13667,9 @@
+@@ -13362,9 +13659,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -6641,7 +7940,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13382,7 +13687,7 @@
+@@ -13382,7 +13679,7 @@
;;
tandem*)
case $cc_basename in
@@ -6650,7 +7949,7 @@
# NonStop-UX NCC 3.20
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -13439,7 +13744,7 @@
+@@ -13439,7 +13736,7 @@
# The `*' in the case matches for architectures that use `case' in
# $output_verbose_cmd can trigger glob expansion during the loop
# eval without this substitution.
@@ -6659,7 +7958,7 @@
for p in `eval $output_verbose_link_cmd`; do
case $p in
-@@ -13479,7 +13784,7 @@
+@@ -13479,7 +13776,7 @@
fi
;;
@@ -6668,7 +7967,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13515,6 +13820,20 @@
+@@ -13515,6 +13812,20 @@
$rm -f confest.$objext
@@ -6689,7 +7988,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13570,7 +13889,7 @@
+@@ -13570,7 +13881,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -6698,7 +7997,7 @@
hppa*64*|ia64*)
;;
*)
-@@ -13595,18 +13914,28 @@
+@@ -13595,18 +13906,28 @@
;;
chorus*)
case $cc_basename in
@@ -6730,7 +8029,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13614,22 +13943,22 @@
+@@ -13614,22 +13935,22 @@
;;
esac
;;
@@ -6757,7 +8056,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -13644,7 +13973,7 @@
+@@ -13644,7 +13965,7 @@
;;
irix5* | irix6* | nonstopux*)
case $cc_basename in
@@ -6766,7 +8065,7 @@
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_static_CXX='-non_shared'
# CC pic flag -KPIC is the default.
-@@ -13655,18 +13984,24 @@
+@@ -13655,18 +13976,24 @@
;;
linux*)
case $cc_basename in
@@ -6794,7 +8093,7 @@
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
# Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13683,25 +14018,25 @@
+@@ -13683,25 +14010,25 @@
;;
mvs*)
case $cc_basename in
@@ -6825,7 +8124,7 @@
# Digital/Compaq C++
lt_prog_compiler_wl_CXX='-Wl,'
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -13717,7 +14052,7 @@
+@@ -13717,7 +14044,7 @@
;;
sco*)
case $cc_basename in
@@ -6834,7 +8133,7 @@
lt_prog_compiler_pic_CXX='-fPIC'
;;
*)
-@@ -13726,13 +14061,13 @@
+@@ -13726,13 +14053,13 @@
;;
solaris*)
case $cc_basename in
@@ -6850,7 +8149,7 @@
# Green Hills C++ Compiler
lt_prog_compiler_pic_CXX='-PIC'
;;
-@@ -13742,12 +14077,12 @@
+@@ -13742,12 +14069,12 @@
;;
sunos4*)
case $cc_basename in
@@ -6865,7 +8164,7 @@
# Lucid
lt_prog_compiler_pic_CXX='-pic'
;;
-@@ -13757,7 +14092,7 @@
+@@ -13757,7 +14084,7 @@
;;
tandem*)
case $cc_basename in
@@ -6874,7 +8173,7 @@
# NonStop-UX NCC 3.20
lt_prog_compiler_pic_CXX='-KPIC'
;;
-@@ -13798,18 +14133,20 @@
+@@ -13798,18 +14125,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -6883,12 +8182,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13804: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14139: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14131: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13808: \$? = $ac_status" >&5
-+ echo "$as_me:14143: \$? = $ac_status" >&5
++ echo "$as_me:14135: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -6900,7 +8199,7 @@
lt_prog_compiler_pic_works_CXX=yes
fi
fi
-@@ -13830,7 +14167,7 @@
+@@ -13830,7 +14159,7 @@
fi
fi
@@ -6909,7 +8208,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_CXX=
-@@ -13852,38 +14189,36 @@
+@@ -13852,38 +14181,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6931,12 +8230,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13871: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14201: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14193: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13875: \$? = $ac_status" >&5
-+ echo "$as_me:14205: \$? = $ac_status" >&5
++ echo "$as_me:14197: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -6960,7 +8259,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13933,7 +14268,10 @@
+@@ -13933,7 +14260,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -6972,7 +8271,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14016,7 +14354,7 @@
+@@ -14016,7 +14346,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6981,7 +8280,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14026,7 +14364,20 @@
+@@ -14026,7 +14356,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7003,7 +8302,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14091,7 +14442,7 @@
+@@ -14091,7 +14434,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7012,7 +8311,7 @@
;;
beos*)
-@@ -14100,7 +14451,7 @@
+@@ -14100,7 +14443,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -7021,7 +8320,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14116,7 +14467,7 @@
+@@ -14116,7 +14459,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7030,7 +8329,7 @@
need_version=no
need_lib_prefix=no
-@@ -14128,7 +14479,8 @@
+@@ -14128,7 +14471,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -7040,7 +8339,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -14158,7 +14510,7 @@
+@@ -14158,7 +14502,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -7049,7 +8348,7 @@
;;
esac
;;
-@@ -14181,7 +14533,7 @@
+@@ -14181,7 +14525,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7058,7 +8357,7 @@
# 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"`
-@@ -14204,7 +14556,7 @@
+@@ -14204,7 +14548,7 @@
dynamic_linker=no
;;
@@ -7067,7 +8366,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14216,8 +14568,17 @@
+@@ -14216,8 +14560,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -7087,7 +8386,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -14235,7 +14596,7 @@
+@@ -14235,7 +14588,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -7096,7 +8395,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14262,9 +14623,9 @@
+@@ -14262,9 +14615,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -7108,7 +8407,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14279,7 +14640,7 @@
+@@ -14279,7 +14632,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7117,7 +8416,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14290,7 +14651,7 @@
+@@ -14290,7 +14643,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7126,7 +8425,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14352,22 +14713,19 @@
+@@ -14352,22 +14705,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -7155,7 +8454,7 @@
# 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,
-@@ -14377,6 +14735,30 @@
+@@ -14377,6 +14727,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7186,7 +8485,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14386,7 +14768,7 @@
+@@ -14386,7 +14760,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7195,7 +8494,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14415,7 +14797,11 @@
+@@ -14415,7 +14789,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7208,7 +8507,7 @@
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
-@@ -14435,7 +14821,7 @@
+@@ -14435,7 +14813,7 @@
os2*)
libname_spec='$name'
@@ -7217,7 +8516,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14537,8 +14923,8 @@
+@@ -14537,8 +14915,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -7228,7 +8527,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_CXX" != no &&
-@@ -14664,8 +15050,7 @@
+@@ -14664,8 +15042,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7238,7 +8537,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14768,8 +15153,7 @@
+@@ -14768,8 +15145,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7248,7 +8547,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14834,8 +15218,7 @@
+@@ -14834,8 +15210,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7258,7 +8557,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14928,8 +15311,7 @@
+@@ -14928,8 +15303,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7268,7 +8567,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14994,8 +15376,7 @@
+@@ -14994,8 +15368,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7278,7 +8577,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15061,8 +15442,7 @@
+@@ -15061,8 +15434,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7288,7 +8587,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15128,8 +15508,7 @@
+@@ -15128,8 +15500,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7298,16 +8597,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15204,7 +15583,7 @@
+@@ -15204,7 +15575,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15207 "configure"
-+#line 15586 "configure"
++#line 15578 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15270,7 +15649,7 @@
+@@ -15270,7 +15641,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7316,16 +8615,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15302,7 +15681,7 @@
+@@ -15302,7 +15673,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 15305 "configure"
-+#line 15684 "configure"
++#line 15676 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15368,7 +15747,7 @@
+@@ -15368,7 +15739,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7334,7 +8633,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15419,7 +15798,8 @@
+@@ -15419,7 +15790,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -7344,7 +8643,7 @@
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 \
-@@ -15519,6 +15899,12 @@
+@@ -15519,6 +15891,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -7357,7 +8656,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -15549,7 +15935,7 @@
+@@ -15549,7 +15927,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7366,7 +8665,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15580,7 +15966,7 @@
+@@ -15580,7 +15958,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7375,7 +8674,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15595,7 +15981,7 @@
+@@ -15595,7 +15973,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
@@ -7384,7 +8683,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -15797,7 +16183,10 @@
+@@ -15797,7 +16175,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -7396,7 +8695,7 @@
fi
-@@ -15873,12 +16262,35 @@
+@@ -15873,12 +16254,35 @@
compiler=$CC
@@ -7433,7 +8732,7 @@
echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15891,7 +16303,7 @@
+@@ -15891,7 +16295,7 @@
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
@@ -7442,7 +8741,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
-@@ -15899,8 +16311,10 @@
+@@ -15899,8 +16303,10 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7455,7 +8754,7 @@
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15977,7 +16391,7 @@
+@@ -15977,7 +16383,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7464,7 +8763,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16003,6 +16417,16 @@
+@@ -16003,6 +16409,16 @@
lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -7481,7 +8780,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -16014,7 +16438,7 @@
+@@ -16014,7 +16430,7 @@
lt_prog_compiler_wl_F77='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -7490,7 +8789,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -16038,12 +16462,19 @@
+@@ -16038,12 +16454,19 @@
;;
linux*)
@@ -7511,7 +8810,7 @@
ccc*)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
-@@ -16064,9 +16495,14 @@
+@@ -16064,9 +16487,14 @@
;;
solaris*)
@@ -7527,7 +8826,7 @@
;;
sunos4*)
-@@ -16088,6 +16524,11 @@
+@@ -16088,6 +16516,11 @@
fi
;;
@@ -7539,7 +8838,7 @@
uts4*)
lt_prog_compiler_pic_F77='-pic'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -16122,18 +16563,20 @@
+@@ -16122,18 +16555,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -7548,12 +8847,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16128: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16569: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16561: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16132: \$? = $ac_status" >&5
-+ echo "$as_me:16573: \$? = $ac_status" >&5
++ echo "$as_me:16565: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -7565,7 +8864,7 @@
lt_prog_compiler_pic_works_F77=yes
fi
fi
-@@ -16154,7 +16597,7 @@
+@@ -16154,7 +16589,7 @@
fi
fi
@@ -7574,7 +8873,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_F77=
-@@ -16176,38 +16619,36 @@
+@@ -16176,38 +16611,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7596,12 +8895,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16195: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16631: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16623: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16199: \$? = $ac_status" >&5
-+ echo "$as_me:16635: \$? = $ac_status" >&5
++ echo "$as_me:16627: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7625,7 +8924,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16278,6 +16719,16 @@
+@@ -16278,6 +16711,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -7642,7 +8941,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -16298,6 +16749,27 @@
+@@ -16298,6 +16741,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -7670,7 +8969,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -16335,7 +16807,7 @@
+@@ -16335,7 +16799,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7679,7 +8978,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16345,13 +16817,13 @@
+@@ -16345,13 +16809,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -7696,7 +8995,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16360,19 +16832,51 @@
+@@ -16360,19 +16824,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7705,9 +9004,10 @@
else
- ld_shlibs=no
+ ld_shlibs_F77=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -7737,10 +9037,9 @@
+ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -7753,7 +9052,7 @@
fi
;;
-@@ -16390,8 +16894,8 @@
+@@ -16390,8 +16886,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7764,7 +9063,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16406,24 +16910,19 @@
+@@ -16406,24 +16902,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7796,7 +9095,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16457,9 +16956,20 @@
+@@ -16457,9 +16948,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -7819,7 +9118,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16476,7 +16986,7 @@
+@@ -16476,7 +16978,7 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes; then
@@ -7828,7 +9127,7 @@
# 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`
-@@ -16497,6 +17007,9 @@
+@@ -16497,6 +16999,9 @@
fi
esac
shared_flag='-shared'
@@ -7838,7 +9137,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -16505,21 +17018,22 @@
+@@ -16505,21 +17010,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7866,7 +9165,7 @@
program main
end
-@@ -16533,8 +17047,7 @@
+@@ -16533,8 +17039,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7876,7 +9175,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16561,14 +17074,13 @@
+@@ -16561,14 +17066,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -7894,7 +9193,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16585,8 +17097,7 @@
+@@ -16585,8 +17089,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7904,7 +9203,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16623,8 +17134,8 @@
+@@ -16623,8 +17126,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
@@ -7915,7 +9214,7 @@
fi
fi
;;
-@@ -16637,7 +17148,7 @@
+@@ -16637,7 +17140,7 @@
ld_shlibs_F77=no
;;
@@ -7924,7 +9223,7 @@
export_dynamic_flag_spec_F77=-rdynamic
;;
-@@ -16647,68 +17158,68 @@
+@@ -16647,68 +17150,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -8037,7 +9336,7 @@
fi
;;
-@@ -16742,8 +17253,8 @@
+@@ -16742,8 +17245,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8048,7 +9347,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16751,7 +17262,7 @@
+@@ -16751,7 +17254,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8057,7 +9356,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -16767,16 +17278,16 @@
+@@ -16767,16 +17270,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -8078,7 +9377,7 @@
hppa*64*|ia64*)
archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -16786,7 +17297,7 @@
+@@ -16786,7 +17289,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -8087,7 +9386,7 @@
hppa*64*)
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16819,7 +17330,7 @@
+@@ -16819,7 +17322,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8096,7 +9395,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16829,7 +17340,7 @@
+@@ -16829,7 +17332,7 @@
link_all_deplibs_F77=yes
;;
@@ -8105,7 +9404,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16852,7 +17363,8 @@
+@@ -16852,7 +17355,8 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -8115,7 +9414,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16862,7 +17374,7 @@
+@@ -16862,7 +17366,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -8124,7 +9423,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16873,14 +17385,14 @@
+@@ -16873,14 +17377,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -8141,7 +9440,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -16892,13 +17404,13 @@
+@@ -16892,13 +17396,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8157,7 +9456,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16917,10 +17429,12 @@
+@@ -16917,10 +17421,12 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -8172,7 +9471,7 @@
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -16929,8 +17443,18 @@
+@@ -16929,8 +17435,18 @@
hardcode_shlibpath_var_F77=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8193,7 +9492,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16939,7 +17463,7 @@
+@@ -16939,7 +17455,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -8202,7 +9501,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16999,9 +17523,9 @@
+@@ -16999,9 +17515,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8214,7 +9513,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17107,7 +17631,7 @@
+@@ -17107,7 +17623,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8223,7 +9522,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17117,7 +17641,20 @@
+@@ -17117,7 +17633,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8245,7 +9544,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17182,7 +17719,7 @@
+@@ -17182,7 +17711,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8254,7 +9553,7 @@
;;
beos*)
-@@ -17191,7 +17728,7 @@
+@@ -17191,7 +17720,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -8263,7 +9562,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17207,7 +17744,7 @@
+@@ -17207,7 +17736,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8272,7 +9571,7 @@
need_version=no
need_lib_prefix=no
-@@ -17219,7 +17756,8 @@
+@@ -17219,7 +17748,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -8282,7 +9581,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -17249,7 +17787,7 @@
+@@ -17249,7 +17779,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8291,7 +9590,7 @@
;;
esac
;;
-@@ -17272,7 +17810,7 @@
+@@ -17272,7 +17802,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8300,7 +9599,7 @@
# 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"`
-@@ -17295,7 +17833,7 @@
+@@ -17295,7 +17825,7 @@
dynamic_linker=no
;;
@@ -8309,7 +9608,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17307,8 +17845,17 @@
+@@ -17307,8 +17837,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -8329,7 +9628,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -17326,7 +17873,7 @@
+@@ -17326,7 +17865,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -8338,7 +9637,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17353,9 +17900,9 @@
+@@ -17353,9 +17892,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -8350,7 +9649,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17370,7 +17917,7 @@
+@@ -17370,7 +17909,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8359,7 +9658,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17381,7 +17928,7 @@
+@@ -17381,7 +17920,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8368,7 +9667,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17443,22 +17990,19 @@
+@@ -17443,22 +17982,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -8397,7 +9696,7 @@
# 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,
-@@ -17468,6 +18012,30 @@
+@@ -17468,6 +18004,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8428,7 +9727,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17477,7 +18045,7 @@
+@@ -17477,7 +18037,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8437,7 +9736,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17506,7 +18074,11 @@
+@@ -17506,7 +18066,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8450,7 +9749,7 @@
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
-@@ -17526,7 +18098,7 @@
+@@ -17526,7 +18090,7 @@
os2*)
libname_spec='$name'
@@ -8459,7 +9758,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17628,8 +18200,8 @@
+@@ -17628,8 +18192,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -8470,7 +9769,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_F77" != no &&
-@@ -17705,7 +18277,8 @@
+@@ -17705,7 +18269,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -8480,7 +9779,7 @@
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 \
-@@ -17805,6 +18378,12 @@
+@@ -17805,6 +18370,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -8493,7 +9792,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -17835,7 +18414,7 @@
+@@ -17835,7 +18406,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8502,7 +9801,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17866,7 +18445,7 @@
+@@ -17866,7 +18437,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8511,7 +9810,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -17881,7 +18460,7 @@
+@@ -17881,7 +18452,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
@@ -8520,7 +9819,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -18083,7 +18662,10 @@
+@@ -18083,7 +18654,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -8532,7 +9831,7 @@
fi
-@@ -18116,7 +18698,7 @@
+@@ -18116,7 +18690,7 @@
lt_simple_compile_test_code="class foo {}\n"
# Code to be used in simple link tests
@@ -8541,7 +9840,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -18127,15 +18709,41 @@
+@@ -18127,15 +18701,41 @@
compiler=$CC
@@ -8583,7 +9882,7 @@
## 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
-@@ -18162,18 +18770,20 @@
+@@ -18162,18 +18762,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8592,12 +9891,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18168: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18776: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18768: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18172: \$? = $ac_status" >&5
-+ echo "$as_me:18780: \$? = $ac_status" >&5
++ echo "$as_me:18772: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -8609,7 +9908,7 @@
lt_cv_prog_compiler_rtti_exceptions=yes
fi
fi
-@@ -18250,7 +18860,7 @@
+@@ -18250,7 +18852,7 @@
hpux*)
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8618,7 +9917,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18276,6 +18886,16 @@
+@@ -18276,6 +18878,16 @@
lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
fi
;;
@@ -8635,7 +9934,7 @@
mingw* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
-@@ -18287,7 +18907,7 @@
+@@ -18287,7 +18899,7 @@
lt_prog_compiler_wl_GCJ='-Wl,'
# PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
# not for PA HP-UX.
@@ -8644,7 +9943,7 @@
hppa*64*|ia64*)
# +Z the default
;;
-@@ -18311,12 +18931,19 @@
+@@ -18311,12 +18923,19 @@
;;
linux*)
@@ -8665,7 +9964,7 @@
ccc*)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
-@@ -18337,9 +18964,14 @@
+@@ -18337,9 +18956,14 @@
;;
solaris*)
@@ -8681,7 +9980,7 @@
;;
sunos4*)
-@@ -18361,6 +18993,11 @@
+@@ -18361,6 +18985,11 @@
fi
;;
@@ -8693,7 +9992,7 @@
uts4*)
lt_prog_compiler_pic_GCJ='-pic'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18395,18 +19032,20 @@
+@@ -18395,18 +19024,20 @@
# with a dollar sign (not a hyphen), so the echo should work correctly.
# The option is referenced via a variable to avoid confusing sed.
lt_compile=`echo "$ac_compile" | $SED \
@@ -8702,12 +10001,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18401: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19038: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19030: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18405: \$? = $ac_status" >&5
-+ echo "$as_me:19042: \$? = $ac_status" >&5
++ echo "$as_me:19034: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
@@ -8719,7 +10018,7 @@
lt_prog_compiler_pic_works_GCJ=yes
fi
fi
-@@ -18427,7 +19066,7 @@
+@@ -18427,7 +19058,7 @@
fi
fi
@@ -8728,7 +10027,7 @@
# For platforms which do not support PIC, -DPIC is meaningless:
*djgpp*)
lt_prog_compiler_pic_GCJ=
-@@ -18449,38 +19088,36 @@
+@@ -18449,38 +19080,36 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8750,12 +10049,12 @@
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18468: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19100: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19092: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18472: \$? = $ac_status" >&5
-+ echo "$as_me:19104: \$? = $ac_status" >&5
++ echo "$as_me:19096: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8779,7 +10078,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18551,6 +19188,16 @@
+@@ -18551,6 +19180,16 @@
# rely on this symbol name, it's probably fine to never include it in
# preloaded symbol tables.
extract_expsyms_cmds=
@@ -8796,7 +10095,7 @@
case $host_os in
cygwin* | mingw* | pw32*)
-@@ -18571,6 +19218,27 @@
+@@ -18571,6 +19210,27 @@
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
@@ -8824,7 +10123,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
-@@ -18608,7 +19276,7 @@
+@@ -18608,7 +19268,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8833,7 +10132,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18618,13 +19286,13 @@
+@@ -18618,13 +19278,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -8850,7 +10149,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18633,19 +19301,51 @@
+@@ -18633,19 +19293,51 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8859,10 +10158,9 @@
else
- ld_shlibs=no
+ ld_shlibs_GCJ=no
- fi
- ;;
-
-- netbsd*)
++ fi
++ ;;
++
+ linux*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
@@ -8892,9 +10190,10 @@
+ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
-+ fi
-+ ;;
-+
+ fi
+ ;;
+
+- netbsd*)
+ netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -8907,7 +10206,7 @@
fi
;;
-@@ -18663,8 +19363,8 @@
+@@ -18663,8 +19355,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8918,7 +10217,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18679,24 +19379,19 @@
+@@ -18679,24 +19371,19 @@
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8950,7 +10249,7 @@
fi
else
# PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18730,9 +19425,20 @@
+@@ -18730,9 +19417,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -8973,7 +10272,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18749,7 +19455,7 @@
+@@ -18749,7 +19447,7 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes; then
@@ -8982,7 +10281,7 @@
# 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`
-@@ -18770,6 +19476,9 @@
+@@ -18770,6 +19468,9 @@
fi
esac
shared_flag='-shared'
@@ -8992,7 +10291,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -18778,21 +19487,22 @@
+@@ -18778,21 +19479,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -9020,7 +10319,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18816,8 +19526,7 @@
+@@ -18816,8 +19518,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9030,7 +10329,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18844,14 +19553,13 @@
+@@ -18844,14 +19545,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9048,7 +10347,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18878,8 +19586,7 @@
+@@ -18878,8 +19578,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9058,7 +10357,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18916,8 +19623,8 @@
+@@ -18916,8 +19615,8 @@
# Exported symbols can be pulled into shared objects from archives
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
@@ -9069,7 +10368,7 @@
fi
fi
;;
-@@ -18930,7 +19637,7 @@
+@@ -18930,7 +19629,7 @@
ld_shlibs_GCJ=no
;;
@@ -9078,7 +10377,7 @@
export_dynamic_flag_spec_GCJ=-rdynamic
;;
-@@ -18940,68 +19647,68 @@
+@@ -18940,68 +19639,68 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -9191,7 +10490,7 @@
fi
;;
-@@ -19035,8 +19742,8 @@
+@@ -19035,8 +19734,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -9202,7 +10501,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19044,7 +19751,7 @@
+@@ -19044,7 +19743,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -9211,7 +10510,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19060,16 +19767,16 @@
+@@ -19060,16 +19759,16 @@
hpux10* | hpux11*)
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -9232,7 +10531,7 @@
hppa*64*|ia64*)
archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
;;
-@@ -19079,7 +19786,7 @@
+@@ -19079,7 +19778,7 @@
esac
fi
if test "$with_gnu_ld" = no; then
@@ -9241,7 +10540,7 @@
hppa*64*)
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19112,7 +19819,7 @@
+@@ -19112,7 +19811,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -9250,7 +10549,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19122,7 +19829,7 @@
+@@ -19122,7 +19821,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -9259,7 +10558,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19145,7 +19852,8 @@
+@@ -19145,7 +19844,8 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -9269,7 +10568,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19155,7 +19863,7 @@
+@@ -19155,7 +19855,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -9278,7 +10577,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19166,14 +19874,14 @@
+@@ -19166,14 +19866,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -9295,7 +10594,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19185,13 +19893,13 @@
+@@ -19185,13 +19885,13 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9311,7 +10610,7 @@
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19210,10 +19918,12 @@
+@@ -19210,10 +19910,12 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -9326,7 +10625,7 @@
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19222,8 +19932,18 @@
+@@ -19222,8 +19924,18 @@
hardcode_shlibpath_var_GCJ=no
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9347,7 +10646,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19232,7 +19952,7 @@
+@@ -19232,7 +19944,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -9356,7 +10655,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19292,9 +20012,9 @@
+@@ -19292,9 +20004,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -9368,7 +10667,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19400,7 +20120,7 @@
+@@ -19400,7 +20112,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -9377,7 +10676,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19410,7 +20130,20 @@
+@@ -19410,7 +20122,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9399,7 +10698,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19475,7 +20208,7 @@
+@@ -19475,7 +20200,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9408,7 +10707,7 @@
;;
beos*)
-@@ -19484,7 +20217,7 @@
+@@ -19484,7 +20209,7 @@
shlibpath_var=LIBRARY_PATH
;;
@@ -9417,7 +10716,7 @@
version_type=linux
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19500,7 +20233,7 @@
+@@ -19500,7 +20225,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9426,7 +10725,7 @@
need_version=no
need_lib_prefix=no
-@@ -19512,7 +20245,8 @@
+@@ -19512,7 +20237,8 @@
dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
@@ -9436,7 +10735,7 @@
postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
dlpath=$dir/\$dldll~
$rm \$dlpath'
-@@ -19542,7 +20276,7 @@
+@@ -19542,7 +20268,7 @@
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9445,7 +10744,7 @@
;;
esac
;;
-@@ -19565,7 +20299,7 @@
+@@ -19565,7 +20291,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9454,7 +10753,7 @@
# 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"`
-@@ -19588,7 +20322,7 @@
+@@ -19588,7 +20314,7 @@
dynamic_linker=no
;;
@@ -9463,7 +10762,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19600,8 +20334,17 @@
+@@ -19600,8 +20326,17 @@
dynamic_linker='GNU ld.so'
;;
@@ -9483,7 +10782,7 @@
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
-@@ -19619,7 +20362,7 @@
+@@ -19619,7 +20354,7 @@
freebsd2*)
shlibpath_overrides_runpath=yes
;;
@@ -9492,7 +10791,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19646,9 +20389,9 @@
+@@ -19646,9 +20381,9 @@
version_type=sunos
need_lib_prefix=no
need_version=no
@@ -9504,7 +10803,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19663,7 +20406,7 @@
+@@ -19663,7 +20398,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9513,7 +10812,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19674,7 +20417,7 @@
+@@ -19674,7 +20409,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9522,7 +10821,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19736,22 +20479,19 @@
+@@ -19736,22 +20471,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -9551,7 +10850,7 @@
# 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,
-@@ -19761,6 +20501,30 @@
+@@ -19761,6 +20493,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9582,7 +10881,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19770,7 +20534,7 @@
+@@ -19770,7 +20526,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9591,7 +10890,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19799,7 +20563,11 @@
+@@ -19799,7 +20555,11 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9604,7 +10903,7 @@
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
-@@ -19819,7 +20587,7 @@
+@@ -19819,7 +20579,7 @@
os2*)
libname_spec='$name'
@@ -9613,7 +10912,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -19921,8 +20689,8 @@
+@@ -19921,8 +20681,8 @@
echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
@@ -9624,7 +10923,7 @@
# We can hardcode non-existant directories.
if test "$hardcode_direct_GCJ" != no &&
-@@ -20048,8 +20816,7 @@
+@@ -20048,8 +20808,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9634,7 +10933,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20152,8 +20919,7 @@
+@@ -20152,8 +20911,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9644,7 +10943,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20218,8 +20984,7 @@
+@@ -20218,8 +20976,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9654,7 +10953,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20312,8 +21077,7 @@
+@@ -20312,8 +21069,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9664,7 +10963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20378,8 +21142,7 @@
+@@ -20378,8 +21134,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9674,7 +10973,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20445,8 +21208,7 @@
+@@ -20445,8 +21200,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9684,7 +10983,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20512,8 +21274,7 @@
+@@ -20512,8 +21266,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9694,16 +10993,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20588,7 +21349,7 @@
+@@ -20588,7 +21341,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20591 "configure"
-+#line 21352 "configure"
++#line 21344 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20654,7 +21415,7 @@
+@@ -20654,7 +21407,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9712,16 +11011,16 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20686,7 +21447,7 @@
+@@ -20686,7 +21439,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 20689 "configure"
-+#line 21450 "configure"
++#line 21442 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20752,7 +21513,7 @@
+@@ -20752,7 +21505,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9730,7 +11029,7 @@
lt_status=$?
case x$lt_status in
x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20803,7 +21564,8 @@
+@@ -20803,7 +21556,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -9740,7 +11039,7 @@
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 \
-@@ -20903,6 +21665,12 @@
+@@ -20903,6 +21657,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9753,7 +11052,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -20933,7 +21701,7 @@
+@@ -20933,7 +21693,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9762,7 +11061,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20964,7 +21732,7 @@
+@@ -20964,7 +21724,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9771,7 +11070,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -20979,7 +21747,7 @@
+@@ -20979,7 +21739,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
@@ -9780,7 +11079,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21181,7 +21949,10 @@
+@@ -21181,7 +21941,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -9792,7 +11091,7 @@
fi
-@@ -21224,11 +21995,35 @@
+@@ -21224,11 +21987,35 @@
compiler=$CC
@@ -9828,7 +11127,7 @@
lt_cv_prog_compiler_c_o_RC=yes
# The else clause should only fire when bootstrapping the
-@@ -21244,7 +22039,8 @@
+@@ -21244,7 +22031,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -9838,7 +11137,7 @@
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 \
-@@ -21344,6 +22140,12 @@
+@@ -21344,6 +22132,12 @@
# The host system.
host_alias=$host_alias
host=$host
@@ -9851,7 +11150,7 @@
# An echo program that does not interpret backslashes.
echo=$lt_echo
-@@ -21374,7 +22176,7 @@
+@@ -21374,7 +22168,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9860,7 +11159,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21405,7 +22207,7 @@
+@@ -21405,7 +22199,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9869,7 +11168,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21420,7 +22222,7 @@
+@@ -21420,7 +22214,7 @@
# Does compiler simultaneously support -c and -o options?
compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
@@ -9878,7 +11177,7 @@
need_locks=$lt_need_locks
# Do we need the lib prefix for modules?
-@@ -21622,7 +22424,10 @@
+@@ -21622,7 +22416,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -9890,7 +11189,7 @@
fi
-@@ -21669,7 +22474,7 @@
+@@ -21669,7 +22466,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9899,7 +11198,7 @@
# Prevent multiple expansion
-@@ -22110,8 +22915,7 @@
+@@ -22110,8 +22907,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9909,7 +11208,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22208,8 +23012,7 @@
+@@ -22208,8 +23004,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9919,7 +11218,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22278,8 +23081,7 @@
+@@ -22278,8 +23073,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9929,7 +11228,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22382,8 +23184,7 @@
+@@ -22382,8 +23176,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9939,7 +11238,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22452,8 +23253,7 @@
+@@ -22452,8 +23245,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9949,7 +11248,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22528,8 +23328,7 @@
+@@ -22528,8 +23320,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9959,7 +11258,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22636,8 +23435,7 @@
+@@ -22636,8 +23427,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9969,7 +11268,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22908,8 +23706,7 @@
+@@ -22908,8 +23698,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9979,7 +11278,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23059,8 +23856,7 @@
+@@ -23059,8 +23848,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9989,7 +11288,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23245,8 +24041,7 @@
+@@ -23245,8 +24033,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9999,7 +11298,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23348,8 +24143,7 @@
+@@ -23348,8 +24135,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10009,7 +11308,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23451,8 +24245,7 @@
+@@ -23451,8 +24237,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10019,7 +11318,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23553,8 +24346,7 @@
+@@ -23553,8 +24338,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10029,7 +11328,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23845,8 +24637,7 @@
+@@ -23845,8 +24629,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10039,7 +11338,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23911,8 +24702,7 @@
+@@ -23911,8 +24694,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10049,7 +11348,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23976,8 +24766,7 @@
+@@ -23976,8 +24758,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10059,7 +11358,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24058,8 +24847,7 @@
+@@ -24058,8 +24839,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10069,7 +11368,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24200,8 +24988,7 @@
+@@ -24200,8 +24980,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10079,7 +11378,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24339,8 +25126,7 @@
+@@ -24339,8 +25118,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10089,7 +11388,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24524,8 +25310,7 @@
+@@ -24524,8 +25302,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10099,7 +11398,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24771,8 +25556,7 @@
+@@ -24771,8 +25548,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10109,7 +11408,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24965,8 +25749,7 @@
+@@ -24965,8 +25741,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10119,7 +11418,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25047,8 +25830,7 @@
+@@ -25047,8 +25822,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10129,7 +11428,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25118,8 +25900,7 @@
+@@ -25118,8 +25892,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10139,7 +11438,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25228,8 +26009,7 @@
+@@ -25228,8 +26001,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10149,7 +11448,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25321,8 +26101,7 @@
+@@ -25321,8 +26093,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10159,7 +11458,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25394,8 +26173,7 @@
+@@ -25394,8 +26165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10169,7 +11468,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25449,8 +26227,7 @@
+@@ -25449,8 +26219,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10179,7 +11478,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25521,8 +26298,7 @@
+@@ -25521,8 +26290,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10189,7 +11488,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25576,8 +26352,7 @@
+@@ -25576,8 +26344,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10199,7 +11498,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25644,8 +26419,7 @@
+@@ -25644,8 +26411,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10209,7 +11508,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25790,7 +26564,8 @@
+@@ -25790,7 +26556,8 @@
@@ -10219,7 +11518,7 @@
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -25823,8 +26598,7 @@
+@@ -25823,8 +26590,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10229,7 +11528,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25998,8 +26772,7 @@
+@@ -25998,8 +26764,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10239,7 +11538,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26165,8 +26938,7 @@
+@@ -26165,8 +26930,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10249,7 +11548,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26342,8 +27114,7 @@
+@@ -26342,8 +27106,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10259,7 +11558,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26423,8 +27194,7 @@
+@@ -26423,8 +27186,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10269,7 +11568,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26592,8 +27362,7 @@
+@@ -26592,8 +27354,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10279,7 +11578,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26671,8 +27440,7 @@
+@@ -26671,8 +27432,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10289,7 +11588,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26850,9 +27618,6 @@
+@@ -26850,9 +27610,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10299,7 +11598,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -26886,8 +27651,7 @@
+@@ -26886,8 +27643,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10309,7 +11608,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26991,8 +27755,7 @@
+@@ -26991,8 +27747,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10319,7 +11618,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27071,9 +27834,6 @@
+@@ -27071,9 +27826,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10329,7 +11628,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -27106,8 +27866,7 @@
+@@ -27106,8 +27858,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10339,7 +11638,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27210,8 +27969,7 @@
+@@ -27210,8 +27961,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10349,7 +11648,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27301,8 +28059,7 @@
+@@ -27301,8 +28051,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10359,7 +11658,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27363,8 +28120,7 @@
+@@ -27363,8 +28112,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10369,7 +11668,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27432,8 +28188,7 @@
+@@ -27432,8 +28180,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10379,7 +11678,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27499,8 +28254,7 @@
+@@ -27499,8 +28246,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10389,7 +11688,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27593,8 +28347,7 @@
+@@ -27593,8 +28339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10399,7 +11698,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27672,8 +28425,7 @@
+@@ -27672,8 +28417,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10409,7 +11708,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27757,8 +28509,7 @@
+@@ -27757,8 +28501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10419,7 +11718,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27826,8 +28577,7 @@
+@@ -27826,8 +28569,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10429,7 +11728,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27922,8 +28672,7 @@
+@@ -27922,8 +28664,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10439,7 +11738,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27987,8 +28736,7 @@
+@@ -27987,8 +28728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10449,7 +11748,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28083,8 +28831,7 @@
+@@ -28083,8 +28823,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10459,7 +11758,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28148,8 +28895,7 @@
+@@ -28148,8 +28887,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10469,7 +11768,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28245,8 +28991,7 @@
+@@ -28245,8 +28983,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10479,7 +11778,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28310,8 +29055,7 @@
+@@ -28310,8 +29047,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10489,7 +11788,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28408,8 +29152,7 @@
+@@ -28408,8 +29144,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10499,7 +11798,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28474,8 +29217,7 @@
+@@ -28474,8 +29209,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10509,7 +11808,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28543,8 +29285,7 @@
+@@ -28543,8 +29277,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10519,7 +11818,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28695,8 +29436,7 @@
+@@ -28695,8 +29428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10529,7 +11828,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28851,8 +29591,7 @@
+@@ -28851,8 +29583,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10539,7 +11838,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28917,8 +29656,7 @@
+@@ -28917,8 +29648,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10549,7 +11848,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29065,8 +29803,7 @@
+@@ -29065,8 +29795,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10559,7 +11858,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29221,8 +29958,7 @@
+@@ -29221,8 +29950,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10569,7 +11868,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29278,9 +30014,6 @@
+@@ -29278,9 +30006,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10579,7 +11878,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29314,8 +30047,7 @@
+@@ -29314,8 +30039,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10589,7 +11888,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29419,8 +30151,7 @@
+@@ -29419,8 +30143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10599,7 +11898,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29520,8 +30251,7 @@
+@@ -29520,8 +30243,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10609,7 +11908,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29595,8 +30325,7 @@
+@@ -29595,8 +30317,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10619,7 +11918,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29659,8 +30388,7 @@
+@@ -29659,8 +30380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10629,7 +11928,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29722,8 +30450,7 @@
+@@ -29722,8 +30442,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10639,7 +11938,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29763,8 +30490,7 @@
+@@ -29763,8 +30482,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10649,7 +11948,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29820,8 +30546,7 @@
+@@ -29820,8 +30538,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10659,7 +11958,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29861,8 +30586,7 @@
+@@ -29861,8 +30578,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10669,7 +11968,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29926,8 +30650,7 @@
+@@ -29926,8 +30642,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10679,7 +11978,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29958,10 +30681,8 @@
+@@ -29958,10 +30673,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10692,7 +11991,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30072,8 +30793,7 @@
+@@ -30072,8 +30785,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10702,7 +12001,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30135,8 +30855,7 @@
+@@ -30135,8 +30847,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10712,7 +12011,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30176,8 +30895,7 @@
+@@ -30176,8 +30887,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10722,7 +12021,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30233,8 +30951,7 @@
+@@ -30233,8 +30943,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10732,7 +12031,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30274,8 +30991,7 @@
+@@ -30274,8 +30983,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10742,7 +12041,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30339,8 +31055,7 @@
+@@ -30339,8 +31047,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10752,7 +12051,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30371,10 +31086,8 @@
+@@ -30371,10 +31078,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10765,7 +12064,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30485,8 +31198,7 @@
+@@ -30485,8 +31190,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10775,7 +12074,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30548,8 +31260,7 @@
+@@ -30548,8 +31252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10785,7 +12084,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30589,8 +31300,7 @@
+@@ -30589,8 +31292,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10795,7 +12094,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30646,8 +31356,7 @@
+@@ -30646,8 +31348,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10805,7 +12104,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30687,8 +31396,7 @@
+@@ -30687,8 +31388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10815,7 +12114,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30752,8 +31460,7 @@
+@@ -30752,8 +31452,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10825,7 +12124,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30784,10 +31491,8 @@
+@@ -30784,10 +31483,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10838,7 +12137,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -30898,8 +31603,7 @@
+@@ -30898,8 +31595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10848,7 +12147,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30961,8 +31665,7 @@
+@@ -30961,8 +31657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10858,7 +12157,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31002,8 +31705,7 @@
+@@ -31002,8 +31697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10868,7 +12167,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31059,8 +31761,7 @@
+@@ -31059,8 +31753,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10878,7 +12177,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31100,8 +31801,7 @@
+@@ -31100,8 +31793,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10888,7 +12187,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31165,8 +31865,7 @@
+@@ -31165,8 +31857,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10898,7 +12197,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31197,10 +31896,8 @@
+@@ -31197,10 +31888,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10911,7 +12210,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -31319,8 +32016,7 @@
+@@ -31319,8 +32008,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10921,7 +12220,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31391,8 +32087,7 @@
+@@ -31391,8 +32079,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10931,7 +12230,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31462,8 +32157,7 @@
+@@ -31462,8 +32149,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10941,7 +12240,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31525,8 +32219,7 @@
+@@ -31525,8 +32211,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10951,7 +12250,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31566,8 +32259,7 @@
+@@ -31566,8 +32251,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10961,7 +12260,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31623,8 +32315,7 @@
+@@ -31623,8 +32307,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10971,7 +12270,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31664,8 +32355,7 @@
+@@ -31664,8 +32347,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10981,7 +12280,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31729,8 +32419,7 @@
+@@ -31729,8 +32411,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10991,7 +12290,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31761,10 +32450,8 @@
+@@ -31761,10 +32442,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11004,7 +12303,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -31876,8 +32563,7 @@
+@@ -31876,8 +32555,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11014,7 +12313,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31939,8 +32625,7 @@
+@@ -31939,8 +32617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11024,7 +12323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -31980,8 +32665,7 @@
+@@ -31980,8 +32657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11034,7 +12333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32037,8 +32721,7 @@
+@@ -32037,8 +32713,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11044,7 +12343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32078,8 +32761,7 @@
+@@ -32078,8 +32753,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11054,7 +12353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32143,8 +32825,7 @@
+@@ -32143,8 +32817,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11064,7 +12363,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32175,10 +32856,8 @@
+@@ -32175,10 +32848,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -11077,7 +12376,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -32289,8 +32968,7 @@
+@@ -32289,8 +32960,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11087,7 +12386,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32371,8 +33049,7 @@
+@@ -32371,8 +33041,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11097,7 +12396,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32472,8 +33149,7 @@
+@@ -32472,8 +33141,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11107,7 +12406,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32653,8 +33329,7 @@
+@@ -32653,8 +33321,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11117,7 +12416,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32763,8 +33438,7 @@
+@@ -32763,8 +33430,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11127,7 +12426,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32988,8 +33662,7 @@
+@@ -32988,8 +33654,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11137,7 +12436,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33212,8 +33885,7 @@
+@@ -33212,8 +33877,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11147,7 +12446,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33289,8 +33961,7 @@
+@@ -33289,8 +33953,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11157,7 +12456,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33516,8 +34187,7 @@
+@@ -33516,8 +34179,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11167,7 +12466,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33592,8 +34262,7 @@
+@@ -33592,8 +34254,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11177,7 +12476,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33653,8 +34322,7 @@
+@@ -33653,8 +34314,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11187,7 +12486,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33737,8 +34405,7 @@
+@@ -33737,8 +34397,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11197,7 +12496,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33831,8 +34498,7 @@
+@@ -33831,8 +34490,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11207,7 +12506,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34006,8 +34672,7 @@
+@@ -34006,8 +34664,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11217,7 +12516,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34105,8 +34770,7 @@
+@@ -34105,8 +34762,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11227,7 +12526,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34193,8 +34857,7 @@
+@@ -34193,8 +34849,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11237,7 +12536,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34271,8 +34934,7 @@
+@@ -34271,8 +34926,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11247,25 +12546,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34325,7 +34987,7 @@
+@@ -34325,7 +34979,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 34328: $i/$j" >&5
-+ echo "configure: 34990: $i/$j" >&5
++ echo "configure: 34982: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -34623,7 +35285,7 @@
+@@ -34623,7 +35277,7 @@
do
for j in $kde_qt_header;
do
- echo "configure: 34626: $i/$j" >&5
-+ echo "configure: 35288: $i/$j" >&5
++ echo "configure: 35280: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -35300,8 +35962,7 @@
+@@ -35300,8 +35954,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11275,34 +12574,34 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35459,7 +36120,7 @@
+@@ -35459,7 +36112,7 @@
do
for j in $kde_check_header;
do
- echo "configure: 35462: $i/$j" >&5
-+ echo "configure: 36123: $i/$j" >&5
++ echo "configure: 36115: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -35489,7 +36150,7 @@
+@@ -35489,7 +36142,7 @@
do
for j in $kde_check_lib;
do
- echo "configure: 35492: $i/$j" >&5
-+ echo "configure: 36153: $i/$j" >&5
++ echo "configure: 36145: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -35507,7 +36168,7 @@
+@@ -35507,7 +36160,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
- echo "configure: 35510: $i/$j" >&5
-+ echo "configure: 36171: $i/$j" >&5
++ echo "configure: 36163: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -35795,8 +36456,7 @@
+@@ -35795,8 +36448,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11312,7 +12611,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35891,8 +36551,7 @@
+@@ -35891,8 +36543,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11322,7 +12621,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35985,8 +36644,7 @@
+@@ -35985,8 +36636,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11332,16 +12631,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37360,7 +38018,7 @@
+@@ -37360,7 +38010,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
- echo "configure: 37363: $i/$j" >&5
-+ echo "configure: 38021: $i/$j" >&5
++ echo "configure: 38013: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -37597,8 +38255,7 @@
+@@ -37597,8 +38247,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11351,7 +12650,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37682,8 +38339,7 @@
+@@ -37682,8 +38331,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11361,7 +12660,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37775,8 +38431,7 @@
+@@ -37775,8 +38423,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11371,7 +12670,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37943,8 +38598,7 @@
+@@ -37943,8 +38590,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11381,7 +12680,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38099,8 +38753,7 @@
+@@ -38099,8 +38745,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11391,7 +12690,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38175,8 +38828,7 @@
+@@ -38175,8 +38820,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11401,7 +12700,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38218,8 +38870,7 @@
+@@ -38218,8 +38862,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11411,7 +12710,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38276,8 +38927,7 @@
+@@ -38276,8 +38919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11421,7 +12720,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38407,9 +39057,6 @@
+@@ -38407,9 +39049,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11431,7 +12730,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38440,8 +39087,7 @@
+@@ -38440,8 +39079,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11441,7 +12740,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38542,8 +39188,7 @@
+@@ -38542,8 +39180,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11451,7 +12750,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38622,9 +39267,6 @@
+@@ -38622,9 +39259,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11461,7 +12760,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38655,8 +39297,7 @@
+@@ -38655,8 +39289,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11471,7 +12770,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38757,8 +39398,7 @@
+@@ -38757,8 +39390,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11481,7 +12780,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38837,9 +39477,6 @@
+@@ -38837,9 +39469,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11491,7 +12790,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38872,8 +39509,7 @@
+@@ -38872,8 +39501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11501,7 +12800,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38976,8 +39612,7 @@
+@@ -38976,8 +39604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11511,7 +12810,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39055,9 +39690,6 @@
+@@ -39055,9 +39682,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11521,7 +12820,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39090,8 +39722,7 @@
+@@ -39090,8 +39714,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11531,7 +12830,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39194,8 +39825,7 @@
+@@ -39194,8 +39817,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11541,7 +12840,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39275,9 +39905,6 @@
+@@ -39275,9 +39897,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11551,7 +12850,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39311,8 +39938,7 @@
+@@ -39311,8 +39930,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11561,7 +12860,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39416,8 +40042,7 @@
+@@ -39416,8 +40034,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11571,7 +12870,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39496,9 +40121,6 @@
+@@ -39496,9 +40113,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11581,7 +12880,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39532,8 +40154,7 @@
+@@ -39532,8 +40146,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11591,7 +12890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39637,8 +40258,7 @@
+@@ -39637,8 +40250,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11601,7 +12900,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39717,9 +40337,6 @@
+@@ -39717,9 +40329,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11611,7 +12910,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -39753,8 +40370,7 @@
+@@ -39753,8 +40362,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11621,7 +12920,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39858,8 +40474,7 @@
+@@ -39858,8 +40466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11631,7 +12930,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39925,7 +40540,9 @@
+@@ -39925,7 +40532,9 @@
@@ -11642,7 +12941,7 @@
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -39993,8 +40610,7 @@
+@@ -39993,8 +40602,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11652,7 +12951,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40052,9 +40668,6 @@
+@@ -40052,9 +40660,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11662,7 +12961,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40087,8 +40700,7 @@
+@@ -40087,8 +40692,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11672,7 +12971,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40191,8 +40803,7 @@
+@@ -40191,8 +40795,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11682,7 +12981,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40271,9 +40882,6 @@
+@@ -40271,9 +40874,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11692,7 +12991,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40308,8 +40916,7 @@
+@@ -40308,8 +40908,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11702,7 +13001,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40414,8 +41021,7 @@
+@@ -40414,8 +41013,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11712,7 +13011,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40494,9 +41100,6 @@
+@@ -40494,9 +41092,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11722,7 +13021,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40529,8 +41132,7 @@
+@@ -40529,8 +41124,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11732,7 +13031,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40633,8 +41235,7 @@
+@@ -40633,8 +41227,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11742,7 +13041,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40712,9 +41313,6 @@
+@@ -40712,9 +41305,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11752,7 +13051,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -40747,8 +41345,7 @@
+@@ -40747,8 +41337,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11762,7 +13061,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40851,8 +41448,7 @@
+@@ -40851,8 +41440,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11772,7 +13071,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40946,8 +41542,7 @@
+@@ -40946,8 +41534,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11782,7 +13081,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41007,9 +41602,6 @@
+@@ -41007,9 +41594,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11792,7 +13091,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41045,8 +41637,7 @@
+@@ -41045,8 +41629,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11802,7 +13101,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41152,8 +41743,7 @@
+@@ -41152,8 +41735,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11812,7 +13111,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41411,8 +42001,7 @@
+@@ -41411,8 +41993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11822,7 +13121,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41532,8 +42121,7 @@
+@@ -41532,8 +42113,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11832,7 +13131,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41714,8 +42302,7 @@
+@@ -41714,8 +42294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11842,16 +13141,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41775,7 +42362,7 @@
+@@ -41775,7 +42354,7 @@
do
for j in qsql.html;
do
- echo "configure: 41778: $i/$j" >&5
-+ echo "configure: 42365: $i/$j" >&5
++ echo "configure: 42357: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -41970,8 +42557,7 @@
+@@ -41970,8 +42549,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11861,17 +13160,359 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42204,8 +42790,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+@@ -42155,109 +42733,270 @@
+
+ #MIN_CONFIG
+
+-# Check whether --enable-dnssd or --disable-dnssd was given.
+-if test "${enable_dnssd+set}" = set; then
+- enableval="$enable_dnssd"
+- with_dnssd=$enableval
++# Check for pkg-config manually first, as if its not installed the
++# PKG_PROG_PKG_CONFIG macro won't be defined.
++
++# Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_have_pkg_config+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- with_dnssd=yes
+-fi;
+-if test "$with_dnssd" = "yes"; then
+-echo "$as_me:$LINENO: checking for DNS-SD support" >&5
+-echo $ECHO_N "checking for DNS-SD support... $ECHO_C" >&6
+-save_dnssdtest_LIBS="$LIBS"
+-save_dnssdtest_LDFLAGS="$LDFLAGS"
+-save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+-LDFLAGS="$all_libraries $LDFLAGS"
+-CPPFLAGS="$CPPFLAGS $all_includes"
+-case $host_os in
+- darwin*) LIBS="" ;;
+- *) LIBS="-ldns_sd" ;;
+-esac
+-have_libdns_sd="no"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
++ if test -n "$have_pkg_config"; then
++ ac_cv_prog_have_pkg_config="$have_pkg_config" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_have_pkg_config="yes"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
+
+- #include <dns_sd.h>
++ test -z "$ac_cv_prog_have_pkg_config" && ac_cv_prog_have_pkg_config="no"
++fi
++fi
++have_pkg_config=$ac_cv_prog_have_pkg_config
++if test -n "$have_pkg_config"; then
++ echo "$as_me:$LINENO: result: $have_pkg_config" >&5
++echo "${ECHO_T}$have_pkg_config" >&6
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
+
+-int
+-main ()
+-{
+
+- DNSServiceRefDeallocate( (DNSServiceRef) 0);
+- TXTRecordDeallocate( (TXTRecordRef*) 0);
++if test x"$have_pkg_config" == xno; then
++ { { echo "$as_me:$LINENO: error: pkg-config is required to install this program" >&5
++echo "$as_me: error: pkg-config is required to install this program" >&2;}
++ { (exit 1); exit 1; }; }
++fi
+
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -42343,8 +42928,7 @@
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DNSSD 1
+-_ACEOF
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
+
+- case $host_os in
+- darwin*) LIB_DNSSD="" ;;
+- *) LIB_DNSSD="-ldns_sd" ;;
+- esac
+- have_libdns_sd="yes"
+- echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
++if test -n "$PKG_CONFIG"; then
++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
+
++ ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+- echo "$as_me:$LINENO: result: no" >&5
++if test -n "$ac_pt_PKG_CONFIG"; then
++ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
++else
++ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+- LIB_DNSSD=""
++fi
+
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++else
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-CPPFLAGS=$save_dnssdtest_CPPFLAGS
+-LDFLAGS=$save_dnssdtest_LDFLAGS
+-LIBS=$save_dnssdtest_LIBS
++
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++ PKG_CONFIG=""
++ fi
++
+ fi
+
+
++ succeeded=no
++
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+-if test "$have_libdns_sd" = "yes"; then
+- HAVE_DNSSD_TRUE=
+- HAVE_DNSSD_FALSE='#'
++if test -n "$PKG_CONFIG"; then
++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
+ else
+- HAVE_DNSSD_TRUE='#'
+- HAVE_DNSSD_FALSE=
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+
++ fi
++
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ echo "$as_me:$LINENO: checking for avahi-qt3 >= 0.4 " >&5
++echo $ECHO_N "checking for avahi-qt3 >= 0.4 ... $ECHO_C" >&6
++
++ if $PKG_CONFIG --exists " avahi-qt3 >= 0.4 , avahi-client >= 0.4 " ; then
++ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++ succeeded=yes
++
++ echo "$as_me:$LINENO: checking AVAHI_CFLAGS" >&5
++echo $ECHO_N "checking AVAHI_CFLAGS... $ECHO_C" >&6
++ AVAHI_CFLAGS=`$PKG_CONFIG --cflags " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
++ echo "$as_me:$LINENO: result: $AVAHI_CFLAGS" >&5
++echo "${ECHO_T}$AVAHI_CFLAGS" >&6
++
++ echo "$as_me:$LINENO: checking AVAHI_LIBS" >&5
++echo $ECHO_N "checking AVAHI_LIBS... $ECHO_C" >&6
++ AVAHI_LIBS=`$PKG_CONFIG --libs " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
++ echo "$as_me:$LINENO: result: $AVAHI_LIBS" >&5
++echo "${ECHO_T}$AVAHI_LIBS" >&6
++ else
++ AVAHI_CFLAGS=""
++ AVAHI_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ AVAHI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " avahi-qt3 >= 0.4 , avahi-client >= 0.4 "`
++ echo $AVAHI_PKG_ERRORS
++ fi
++
++
++
++ else
++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
++
++ if test $succeeded = yes; then
++ :
++ else
++ { { echo "$as_me:$LINENO: error: Library requirements ( avahi-qt3 >= 0.4 , avahi-client >= 0.4 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
++echo "$as_me: error: Library requirements ( avahi-qt3 >= 0.4 , avahi-client >= 0.4 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
++ { (exit 1); exit 1; }; }
++ fi
++
++
++
++if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" avahi-client >= 0.6\"") >&5
++ ($PKG_CONFIG --exists --print-errors " avahi-client >= 0.6") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++
++cat >>confdefs.h <<\_ACEOF
++#define AVAHI_API_0_6 1
++_ACEOF
++
++fi
+
+
+
+@@ -42343,8 +43082,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11881,7 +13522,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42490,8 +43074,7 @@
+@@ -42490,8 +43228,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11891,7 +13532,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42649,8 +43232,7 @@
+@@ -42649,8 +43386,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11901,7 +13542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42716,8 +43298,7 @@
+@@ -42716,8 +43452,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11911,7 +13552,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42917,8 +43498,7 @@
+@@ -42917,8 +43652,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11921,7 +13562,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43080,8 +43660,7 @@
+@@ -43080,8 +43814,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11931,7 +13572,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43214,8 +43793,7 @@
+@@ -43214,8 +43947,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11941,7 +13582,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43284,8 +43862,7 @@
+@@ -43284,8 +44016,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11951,7 +13592,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43373,8 +43950,7 @@
+@@ -43373,8 +44104,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11961,7 +13602,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43464,8 +44040,7 @@
+@@ -43464,8 +44194,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11971,7 +13612,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43590,7 +44165,8 @@
+@@ -43590,7 +44319,8 @@
@@ -11981,7 +13622,7 @@
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -43658,8 +44234,7 @@
+@@ -43658,8 +44388,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11991,7 +13632,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43725,8 +44300,7 @@
+@@ -43725,8 +44454,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12001,7 +13642,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43830,8 +44404,7 @@
+@@ -43830,8 +44558,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12011,7 +13652,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43932,8 +44505,7 @@
+@@ -43932,8 +44659,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12021,7 +13662,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44088,8 +44660,7 @@
+@@ -44088,8 +44814,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12031,7 +13672,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44133,8 +44704,7 @@
+@@ -44133,8 +44858,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12041,7 +13682,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44202,8 +44772,7 @@
+@@ -44202,8 +44926,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12051,7 +13692,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44264,8 +44833,7 @@
+@@ -44264,8 +44987,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12061,7 +13702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44309,8 +44877,7 @@
+@@ -44309,8 +45031,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12071,7 +13712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44378,8 +44945,7 @@
+@@ -44378,8 +45099,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12081,7 +13722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44445,8 +45011,7 @@
+@@ -44445,8 +45165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12091,7 +13732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44732,8 +45297,7 @@
+@@ -44732,8 +45451,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12101,7 +13742,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44878,8 +45442,7 @@
+@@ -44878,8 +45596,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12111,7 +13752,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45013,8 +45576,7 @@
+@@ -45013,8 +45730,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12121,7 +13762,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45160,8 +45722,7 @@
+@@ -45160,8 +45876,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12131,7 +13772,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45252,8 +45813,7 @@
+@@ -45252,8 +45967,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12141,7 +13782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45422,8 +45982,7 @@
+@@ -45422,8 +46136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12151,7 +13792,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45494,8 +46053,7 @@
+@@ -45494,8 +46207,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12161,7 +13802,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45547,8 +46105,7 @@
+@@ -45547,8 +46259,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12171,7 +13812,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45600,8 +46157,7 @@
+@@ -45600,8 +46311,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12181,7 +13822,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45653,8 +46209,7 @@
+@@ -45653,8 +46363,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12191,7 +13832,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45710,8 +46265,7 @@
+@@ -45710,8 +46419,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12201,7 +13842,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45855,8 +46409,7 @@
+@@ -45855,8 +46563,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12211,7 +13852,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45927,8 +46480,7 @@
+@@ -45927,8 +46634,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12221,7 +13862,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46266,8 +46818,7 @@
+@@ -46266,8 +46972,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12231,7 +13872,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46370,8 +46921,7 @@
+@@ -46370,8 +47075,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12241,7 +13882,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46440,8 +46990,7 @@
+@@ -46440,8 +47144,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12251,7 +13892,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46594,8 +47143,7 @@
+@@ -46594,8 +47297,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12261,7 +13902,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46705,8 +47253,7 @@
+@@ -46705,8 +47407,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12271,7 +13912,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46811,8 +47358,7 @@
+@@ -46811,8 +47512,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12281,7 +13922,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46879,8 +47425,7 @@
+@@ -46879,8 +47579,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12291,7 +13932,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46982,8 +47527,7 @@
+@@ -46982,8 +47681,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12301,7 +13942,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47316,8 +47860,7 @@
+@@ -47316,8 +48014,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12311,7 +13952,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47406,8 +47949,7 @@
+@@ -47406,8 +48103,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12321,7 +13962,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47496,8 +48038,7 @@
+@@ -47496,8 +48192,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12331,7 +13972,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47591,8 +48132,7 @@
+@@ -47591,8 +48286,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12341,7 +13982,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47765,8 +48305,7 @@
+@@ -47765,8 +48459,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12351,7 +13992,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47896,8 +48435,7 @@
+@@ -47896,8 +48589,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12361,7 +14002,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47993,8 +48531,7 @@
+@@ -47993,8 +48685,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12371,7 +14012,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48112,8 +48649,7 @@
+@@ -48112,8 +48803,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12381,7 +14022,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48190,8 +48726,7 @@
+@@ -48190,8 +48880,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12391,16 +14032,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48244,7 +48779,7 @@
+@@ -48244,7 +48933,7 @@
do
for j in jpeglib.h;
do
- echo "configure: 48247: $i/$j" >&5
-+ echo "configure: 48782: $i/$j" >&5
++ echo "configure: 48936: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -48337,8 +48872,7 @@
+@@ -48337,8 +49026,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12410,7 +14051,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48434,8 +48968,7 @@
+@@ -48434,8 +49122,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12420,7 +14061,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48607,8 +49140,7 @@
+@@ -48607,8 +49294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12430,7 +14071,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48742,8 +49274,7 @@
+@@ -48742,8 +49428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12440,7 +14081,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49035,8 +49566,7 @@
+@@ -49035,8 +49720,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12450,7 +14091,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49245,8 +49775,7 @@
+@@ -49245,8 +49929,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12460,7 +14101,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49341,8 +49870,7 @@
+@@ -49341,8 +50024,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12470,7 +14111,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49432,8 +49960,7 @@
+@@ -49432,8 +50114,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12480,7 +14121,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49618,8 +50145,7 @@
+@@ -49618,8 +50299,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12490,7 +14131,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49694,8 +50220,7 @@
+@@ -49694,8 +50374,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12500,7 +14141,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49832,8 +50357,7 @@
+@@ -49832,8 +50511,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12510,7 +14151,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49878,6 +50402,149 @@
+@@ -49878,6 +50556,149 @@
fi
@@ -12660,16 +14301,16 @@
LIBSSL="-lssl -lcrypto"
-@@ -49919,7 +50586,7 @@
+@@ -49919,7 +50740,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 49922: $i/$j" >&5
-+ echo "configure: 50589: $i/$j" >&5
++ echo "configure: 50743: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -49974,8 +50641,7 @@
+@@ -49974,8 +50795,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12679,7 +14320,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50275,8 +50941,7 @@
+@@ -50275,8 +51095,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12689,7 +14330,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50496,8 +51161,7 @@
+@@ -50496,8 +51315,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12699,25 +14340,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50650,7 +51314,7 @@
+@@ -50650,7 +51468,7 @@
do
for j in gssapi.h;
do
- echo "configure: 50653: $i/$j" >&5
-+ echo "configure: 51317: $i/$j" >&5
++ echo "configure: 51471: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_incdir=$i
-@@ -50672,7 +51336,7 @@
+@@ -50672,7 +51490,7 @@
do
for j in libgssapi.$ext;
do
- echo "configure: 50675: $i/$j" >&5
-+ echo "configure: 51339: $i/$j" >&5
++ echo "configure: 51493: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
gssapi_libdir=$i
-@@ -50790,8 +51454,7 @@
+@@ -50790,8 +51608,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12727,7 +14368,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50944,8 +51607,7 @@
+@@ -50944,8 +51761,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12737,7 +14378,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51018,8 +51680,7 @@
+@@ -51018,8 +51834,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12747,7 +14388,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51092,8 +51753,7 @@
+@@ -51092,8 +51907,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12757,7 +14398,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51166,8 +51826,7 @@
+@@ -51166,8 +51980,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12767,7 +14408,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51317,8 +51976,7 @@
+@@ -51317,8 +52130,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12777,7 +14418,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51438,8 +52096,7 @@
+@@ -51438,8 +52250,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12787,7 +14428,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51515,8 +52172,7 @@
+@@ -51515,8 +52326,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12797,7 +14438,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51723,8 +52379,7 @@
+@@ -51723,8 +52533,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12807,7 +14448,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51800,8 +52455,7 @@
+@@ -51800,8 +52609,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12817,7 +14458,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52017,8 +52671,7 @@
+@@ -52017,8 +52825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12827,7 +14468,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52185,8 +52838,7 @@
+@@ -52185,8 +52992,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12837,7 +14478,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52351,8 +53003,7 @@
+@@ -52351,8 +53157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12847,7 +14488,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52413,8 +53064,7 @@
+@@ -52413,8 +53218,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12857,7 +14498,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52481,8 +53131,7 @@
+@@ -52481,8 +53285,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12867,7 +14508,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52562,8 +53211,7 @@
+@@ -52562,8 +53365,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -12877,7 +14518,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53575,6 +54223,13 @@
+@@ -53575,6 +54377,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -12891,17 +14532,65 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -54779,6 +55434,9 @@
- s, at AMTAR@,$AMTAR,;t t
- s, at am__tar@,$am__tar,;t t
- s, at am__untar@,$am__untar,;t t
+@@ -53638,13 +54447,6 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-if test -z "${HAVE_DNSSD_TRUE}" && test -z "${HAVE_DNSSD_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"HAVE_DNSSD\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"HAVE_DNSSD\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+ if test -z "${include_SVGICONS_TRUE}" && test -z "${include_SVGICONS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"include_SVGICONS\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -54768,6 +55570,7 @@
+ s, at AUTOMAKE@,$AUTOMAKE,;t t
+ s, at AUTOHEADER@,$AUTOHEADER,;t t
+ s, at MAKEINFO@,$MAKEINFO,;t t
++s, at AMTAR@,$AMTAR,;t t
+ s, at install_sh@,$install_sh,;t t
+ s, at STRIP@,$STRIP,;t t
+ s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
+@@ -54776,9 +55579,9 @@
+ s, at AWK@,$AWK,;t t
+ s, at SET_MAKE@,$SET_MAKE,;t t
+ s, at am__leading_dot@,$am__leading_dot,;t t
+-s, at AMTAR@,$AMTAR,;t t
+-s, at am__tar@,$am__tar,;t t
+-s, at am__untar@,$am__untar,;t t
+s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s, at MAINT@,$MAINT,;t t
s, at CC@,$CC,;t t
s, at CFLAGS@,$CFLAGS,;t t
s, at LDFLAGS@,$LDFLAGS,;t t
-@@ -55286,11 +55944,6 @@
+@@ -54972,9 +55775,11 @@
+ s, at include_VERSION_SCRIPT_TRUE@,$include_VERSION_SCRIPT_TRUE,;t t
+ s, at include_VERSION_SCRIPT_FALSE@,$include_VERSION_SCRIPT_FALSE,;t t
+ s, at MD5SUM@,$MD5SUM,;t t
+-s, at LIB_DNSSD@,$LIB_DNSSD,;t t
+-s, at HAVE_DNSSD_TRUE@,$HAVE_DNSSD_TRUE,;t t
+-s, at HAVE_DNSSD_FALSE@,$HAVE_DNSSD_FALSE,;t t
++s, at have_pkg_config@,$have_pkg_config,;t t
++s, at PKG_CONFIG@,$PKG_CONFIG,;t t
++s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
++s, at AVAHI_CFLAGS@,$AVAHI_CFLAGS,;t t
++s, at AVAHI_LIBS@,$AVAHI_LIBS,;t t
+ s, at LUA@,$LUA,;t t
+ s, at LUA_INCLUDES@,$LUA_INCLUDES,;t t
+ s, at LUA_LIBS@,$LUA_LIBS,;t t
+@@ -55008,7 +55813,6 @@
+ s, at KJAVA_POLICYPATH@,$KJAVA_POLICYPATH,;t t
+ s, at LIBTIFF@,$LIBTIFF,;t t
+ s, at LIB_JASPER@,$LIB_JASPER,;t t
+-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+ s, at LIB_EXR@,$LIB_EXR,;t t
+ s, at EXR_FLAGS@,$EXR_FLAGS,;t t
+ s, at include_TIFF_MODULES_TRUE@,$include_TIFF_MODULES_TRUE,;t t
+@@ -55286,11 +56090,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -12913,7 +14602,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -55329,6 +55982,12 @@
+@@ -55329,6 +56128,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -12926,6 +14615,45 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
+@@ -55742,21 +56547,27 @@
+ else
+ continue
+ fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
++ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
++ # Extract the definition of DEP_FILES 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" | \
++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
++ # 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 '
++ /^DEP_FILES = .*\\\\$/ {
++ s/^DEP_FILES = //
++ :loop
++ s/\\\\$//
++ p
++ n
++ /\\\\$/ b loop
++ p
++ }
++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
--- configure.in
+++ configure.in
@@ -23,6 +23,8 @@
@@ -12955,8 +14683,65 @@
AH_BOTTOM([
/* provide a definition for a 32 bit entity, usable as a typedef, possibly
-@@ -707,7 +709,7 @@
+@@ -496,42 +498,21 @@
+ #MIN_CONFIG
+
+-AC_ARG_ENABLE(dnssd, [ --disable-dnssd don't require libdns_sd (browsing and publishing DNS-SD services will not be possible) ], with_dnssd=$enableval, with_dnssd=yes)
+-if test "$with_dnssd" = "yes"; then
+-AC_MSG_CHECKING(for DNS-SD support)
+-save_dnssdtest_LIBS="$LIBS"
+-save_dnssdtest_LDFLAGS="$LDFLAGS"
+-save_dnssdtest_CPPFLAGS="$CPPFLAGS"
+-LDFLAGS="$all_libraries $LDFLAGS"
+-CPPFLAGS="$CPPFLAGS $all_includes"
+-case $host_os in
+- darwin*) LIBS="" ;;
+- *) LIBS="-ldns_sd" ;;
+-esac
+-have_libdns_sd="no"
+-AC_TRY_LINK( [
+- #include <dns_sd.h>
+- ],[
+- DNSServiceRefDeallocate( (DNSServiceRef) 0);
+- TXTRecordDeallocate( (TXTRecordRef*) 0);
+- ],[
+- AC_DEFINE(HAVE_DNSSD,1,[Define if dns-sd is available])
+- case $host_os in
+- darwin*) LIB_DNSSD="" ;;
+- *) LIB_DNSSD="-ldns_sd" ;;
+- esac
+- have_libdns_sd="yes"
+- AC_MSG_RESULT(yes)
+- ],[
+- AC_MSG_RESULT(no)
+- LIB_DNSSD=""
+-])
+-CPPFLAGS=$save_dnssdtest_CPPFLAGS
+-LDFLAGS=$save_dnssdtest_LDFLAGS
+-LIBS=$save_dnssdtest_LIBS
++# Check for pkg-config manually first, as if its not installed the
++# PKG_PROG_PKG_CONFIG macro won't be defined.
++m4_pattern_allow(PKG_CONFIG_MIN_VERSION)
++AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
++
++if test x"$have_pkg_config" == xno; then
++ AC_MSG_ERROR(pkg-config is required to install this program)
+ fi
+-AC_SUBST(LIB_DNSSD)
+-AM_CONDITIONAL(HAVE_DNSSD, test "$have_libdns_sd" = "yes")
++
++PKG_PROG_PKG_CONFIG
++
++PKG_CHECK_MODULES( AVAHI, [ avahi-qt3 >= 0.4 , avahi-client >= 0.4 ])
++AC_SUBST(AVAHI_CFLAGS)
++AC_SUBST(AVAHI_LIBS)
++PKG_CHECK_EXISTS( [ avahi-client >= 0.6], AC_DEFINE(AVAHI_API_0_6,1,[Avahi API 0.6] ) )
+ dnl =======================================================
+ dnl FILE: ./kate/part/configure.in.in
+ dnl =======================================================
+@@ -707,7 +688,7 @@
+
KDE_CHECK_HEADERS([netinet/in.h net/if.h],,,[$netincludes])
KDE_CHECK_HEADERS([sys/filio.h])
-AC_CHECK_FUNCS([usleep poll])
@@ -12964,7 +14749,7 @@
dnl Check for struct addrinfo
AC_CHECK_TYPES([struct addrinfo],,,[$netincludes])
-@@ -1681,6 +1683,51 @@
+@@ -1681,6 +1662,51 @@
AC_MSG_RESULT(no)
fi
fi
@@ -13018,7 +14803,93 @@
dnl =======================================================
--- dcop/KDE-ICE/Makefile.in
+++ dcop/KDE-ICE/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkICE_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -72,13 +74,36 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/accept.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/authutil.Plo ./$(DEPDIR)/connect.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/error.Plo ./$(DEPDIR)/getauth.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/globals.Plo ./$(DEPDIR)/iceauth.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/listen.Plo ./$(DEPDIR)/listenwk.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/locking.Plo ./$(DEPDIR)/misc.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ping.Plo ./$(DEPDIR)/process.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/protosetup.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/register.Plo ./$(DEPDIR)/replywait.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/setauth.Plo ./$(DEPDIR)/shutdown.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/transport.Plo ./$(DEPDIR)/watch.Plo
++#>+ 11
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/accept.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/authutil.Plo ./$(DEPDIR)/connect.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/error.Plo ./$(DEPDIR)/getauth.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/globals.Plo ./$(DEPDIR)/iceauth.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/listen.Plo ./$(DEPDIR)/listenwk.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/locking.Plo ./$(DEPDIR)/misc.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ping.Plo ./$(DEPDIR)/process.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/protosetup.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/register.Plo ./$(DEPDIR)/replywait.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/setauth.Plo ./$(DEPDIR)/shutdown.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/transport.Plo ./$(DEPDIR)/watch.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkICE_la_SOURCES)
+ DIST_SOURCES = $(libkICE_la_SOURCES)
+@@ -100,6 +125,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -141,8 +168,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -219,7 +244,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -256,6 +280,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13028,7 +14899,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -311,6 +338,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -320,8 +348,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -339,6 +365,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -537,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -13037,7 +14933,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -575,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13049,9 +14945,185 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -622,21 +649,24 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -747,7 +777,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- dcop/Makefile.in
+++ dcop/Makefile.in
-@@ -372,6 +372,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -40,6 +40,10 @@
+
+
+
++#>- SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES)
++#>+ 1
++SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) $(dcopserver_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -81,14 +85,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
++am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -143,39 +140,60 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I. -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dcop_deadlock_test.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_shutdown.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopsignals.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testdcopc.Po
++#>+ 16
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/dcopserver.la.Po $(DEPDIR)/dcopserver_dummy.Plo $(DEPDIR)/libkdeinit_dcopserver_la.all_cpp.P $(DEPDIR)/dcopserver_la.all_cpp.P $(DEPDIR)/libDCOP_la.all_cpp.P ./$(DEPDIR)/dcop_deadlock_test.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_shutdown.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopsignals.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testdcopc.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/dcopserver.la.Po $(DEPDIR)/dcopserver_dummy.Plo ./$(DEPDIR)/dcop_deadlock_test.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_shutdown.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopsignals.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testdcopc.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
+-#>- $(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
+-#>- $(testdcop_SOURCES) $(testdcopc_SOURCES)
+-#>+ 3
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
+ $(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
+- $(testdcop_SOURCES) $(testdcopc_SOURCES) $(dcopserver_SOURCES)
++ $(testdcop_SOURCES) $(testdcopc_SOURCES)
+ #>- DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
+ #>- $(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
+ #>- $(testdcop_SOURCES) $(testdcopc_SOURCES)
+@@ -216,6 +234,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -257,8 +277,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -335,7 +353,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -372,6 +389,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13061,7 +15133,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -655,7 +658,7 @@
+@@ -427,6 +447,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -436,8 +457,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -455,6 +474,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -655,7 +675,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -13070,7 +15167,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -693,9 +696,9 @@
+@@ -693,9 +713,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13082,16 +15179,210 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
dcop-path.h: stamp-h2
-@@ -707,7 +710,7 @@
+@@ -707,10 +727,6 @@
stamp-h2: $(srcdir)/dcop-path.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status dcop/dcop-path.h
-$(srcdir)/dcop-path.h.in: $(am__configure_deps)
-+$(srcdir)/dcop-path.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h2
- touch $@
-@@ -1329,18 +1332,18 @@
+- cd $(top_srcdir) && $(AUTOHEADER)
+- rm -f stamp-h2
+- touch $@
+
+ distclean-hdr:
+ -rm -f dcop-path.h stamp-h2
+@@ -719,7 +735,7 @@
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -727,8 +743,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -746,7 +762,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -754,8 +770,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -848,42 +864,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -900,7 +922,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -908,7 +930,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -920,13 +942,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -938,7 +954,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -946,13 +962,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -973,7 +983,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1073,17 +1083,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1118,7 +1126,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1329,18 +1337,18 @@
dcopserver_DEPENDENCIES = libkdeinit_dcopserver.la
#>+ 3
@@ -13116,7 +15407,7 @@
#>+ 3
dcopserver.moc: $(srcdir)/dcopserver.h
-@@ -1372,7 +1375,7 @@
+@@ -1372,7 +1380,7 @@
#>+ 3
clean-metasources:
@@ -13125,7 +15416,7 @@
#>+ 2
KDE_DIST=dcop-path.h.in dcopserver_shutdown_win.cpp configure.in.in Makefile.in dcopc.h libDCOP.nmcheck dcop_deadlock_test.h dcopserver_win.cpp Makefile.am libDCOP_weak.nmcheck
-@@ -1493,8 +1496,8 @@
+@@ -1493,8 +1501,8 @@
#>+ 18
nmcheck: nmcheck_libDCOP.la
@@ -13137,7 +15428,104 @@
--- dcop/client/Makefile.in
+++ dcop/client/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(dcop_SOURCES) $(dcopclient_SOURCES) $(dcopfind_SOURCES) $(dcopobject_SOURCES) $(dcopquit_SOURCES) $(dcopref_SOURCES) $(dcopstart_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -98,32 +100,41 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dcop.Po ./$(DEPDIR)/dcopclient.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopfind.Po ./$(DEPDIR)/dcopobject.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopquit.Po ./$(DEPDIR)/dcopref.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopstart.Po
++#>+ 4
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dcop.Po ./$(DEPDIR)/dcopclient.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopfind.Po ./$(DEPDIR)/dcopobject.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopquit.Po ./$(DEPDIR)/dcopref.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopstart.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(dcop_SOURCES) $(dcopclient_SOURCES) $(dcopfind_SOURCES) \
+ $(dcopobject_SOURCES) $(dcopquit_SOURCES) $(dcopref_SOURCES) \
+ $(dcopstart_SOURCES)
+@@ -147,6 +158,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -188,8 +201,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -266,7 +277,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -303,6 +313,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13147,7 +15535,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -358,6 +371,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -367,8 +381,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -386,6 +398,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -566,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -13156,7 +15569,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -604,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13168,9 +15581,158 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -676,42 +689,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -825,7 +844,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- dcop/dcopidl/Makefile.in
+++ dcop/dcopidl/Makefile.in
-@@ -264,6 +264,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(dcopidl_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -70,24 +72,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/scanner.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/yacc.Po
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/dcopidl.all_cc.P ./$(DEPDIR)/main.Po ./$(DEPDIR)/scanner.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/yacc.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/scanner.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/yacc.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(dcopidl_SOURCES)
+ DIST_SOURCES = $(dcopidl_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -108,6 +117,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -149,8 +160,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -227,7 +236,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -264,6 +272,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13180,7 +15742,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -319,6 +330,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -328,8 +340,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -347,6 +357,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -518,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13189,7 +15776,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -556,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13201,9 +15788,158 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -606,42 +617,48 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -756,7 +773,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- dcop/dcopidl2cpp/Makefile.in
+++ dcop/dcopidl2cpp/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(dcopidl2cpp_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -72,24 +74,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/skel.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/stub.Po ./$(DEPDIR)/stubimpl.Po
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/dcopidl2cpp.all_cpp.P ./$(DEPDIR)/main.Po ./$(DEPDIR)/skel.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/stub.Po ./$(DEPDIR)/stubimpl.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/skel.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/stub.Po ./$(DEPDIR)/stubimpl.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(dcopidl2cpp_SOURCES)
+ DIST_SOURCES = $(dcopidl2cpp_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -110,6 +119,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -151,8 +162,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -229,7 +238,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -266,6 +274,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13213,7 +15949,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -321,6 +332,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -330,8 +342,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -349,6 +359,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -517,7 +528,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13222,7 +15983,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +566,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13234,9 +15995,105 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -606,21 +617,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -735,7 +749,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- dcop/dcopidlng/Makefile.in
+++ dcop/dcopidlng/Makefile.in
-@@ -239,6 +239,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -53,19 +53,12 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dcopidlnglibdir)" \
+- "$(DESTDIR)$(dcopidlnglibdir)"
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dcopidlnglibdir)" "$(DESTDIR)$(dcopidlnglibdir)"
+ binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ dcopidlnglibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(bin_SCRIPTS) $(dcopidlnglib_SCRIPTS)
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ dcopidlnglibDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(dcopidlnglib_DATA)
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -83,6 +76,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -124,8 +119,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -202,7 +195,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -239,6 +231,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13246,7 +16103,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -294,6 +289,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -303,8 +299,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -322,6 +316,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -487,7 +482,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13255,7 +16137,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -525,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13267,7 +16149,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
-@@ -732,7 +735,7 @@
+@@ -582,7 +577,7 @@
+ test -z "$(dcopidlnglibdir)" || $(mkdir_p) "$(DESTDIR)$(dcopidlnglibdir)"
+ @list='$(dcopidlnglib_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(dcopidlnglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dcopidlnglibdir)/$$f'"; \
+ $(dcopidlnglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dcopidlnglibdir)/$$f"; \
+ done
+@@ -590,7 +585,7 @@
+ uninstall-dcopidlnglibDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dcopidlnglib_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(dcopidlnglibdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(dcopidlnglibdir)/$$f"; \
+ done
+@@ -655,7 +650,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -732,7 +727,7 @@
.NOEXPORT:
#>+ 2
@@ -13278,7 +16187,89 @@
docs-am:
--- dcop/tests/Makefile.in
+++ dcop/tests/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -72,24 +74,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/driver.Po ./$(DEPDIR)/test.Po
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/test_skel.P $(DEPDIR)/test_stub.P $(DEPDIR)/dcop_test.all_cpp.P $(DEPDIR)/driver.all_cpp.P ./$(DEPDIR)/driver.Po ./$(DEPDIR)/test.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/test_skel.P $(DEPDIR)/test_stub.P ./$(DEPDIR)/driver.Po ./$(DEPDIR)/test.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
+ DIST_SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
+ ETAGS = etags
+@@ -109,6 +115,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -150,8 +158,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -228,7 +234,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -265,6 +270,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13288,7 +16279,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -320,6 +328,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -329,8 +338,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -348,6 +355,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -524,7 +532,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13297,7 +16313,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -562,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13309,9 +16325,179 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -593,21 +601,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -721,7 +732,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- dnssd/Makefile.in
+++ dnssd/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkdnssd_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,48 +57,68 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(dnssdincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libkdnssd_la_DEPENDENCIES = ../kdecore/libkdecore.la \
+ $(am__DEPENDENCIES_1)
+-am_libkdnssd_la_OBJECTS = remoteservice.lo responder.lo servicebase.lo \
+- publicservice.lo query.lo domainbrowser.lo servicebrowser.lo
++am_libkdnssd_la_OBJECTS = libkdnssd_la-remoteservice.lo \
++ libkdnssd_la-responder.lo libkdnssd_la-servicebase.lo \
++ libkdnssd_la-publicservice.lo libkdnssd_la-query.lo \
++ libkdnssd_la-domainbrowser.lo libkdnssd_la-servicebrowser.lo
+ #>- libkdnssd_la_OBJECTS = $(am_libkdnssd_la_OBJECTS)
+-#>+ 5
++#>+ 7
+ libkdnssd_la_final_OBJECTS = libkdnssd_la.all_cpp.lo
+-libkdnssd_la_nofinal_OBJECTS = remoteservice.lo responder.lo servicebase.lo \
+- publicservice.lo query.lo domainbrowser.lo servicebrowser.lo settings.lo
++libkdnssd_la_nofinal_OBJECTS = libkdnssd_la-remoteservice.lo \
++ libkdnssd_la-responder.lo libkdnssd_la-servicebase.lo \
++ libkdnssd_la-publicservice.lo libkdnssd_la-query.lo \
++ libkdnssd_la-domainbrowser.lo libkdnssd_la-servicebrowser.lo settings.lo
+ @KDE_USE_FINAL_FALSE at libkdnssd_la_OBJECTS = $(libkdnssd_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE at libkdnssd_la_OBJECTS = $(libkdnssd_la_final_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/libkdnssd_la-domainbrowser.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-publicservice.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-query.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-remoteservice.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-responder.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebrowser.Plo
++#>+ 14
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/settings.P $(DEPDIR)/libkdnssd_la.all_cpp.P ./$(DEPDIR)/libkdnssd_la-domainbrowser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-publicservice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-query.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-remoteservice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-responder.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebrowser.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/settings.P ./$(DEPDIR)/libkdnssd_la-domainbrowser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-publicservice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-query.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-remoteservice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-responder.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdnssd_la-servicebrowser.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkdnssd_la_SOURCES)
+ DIST_SOURCES = $(libkdnssd_la_SOURCES)
+ dnssdincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -118,6 +140,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -159,8 +183,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -237,7 +259,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,6 +295,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13321,8 +16507,52 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -329,6 +353,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,8 +363,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -357,6 +380,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -515,7 +539,7 @@
+ xdg_menudir = @xdg_menudir@
+ # set the include path for X, qt and KDE
+-INCLUDES = -I$(top_srcdir) $(all_includes)
++INCLUDES = -I$(top_srcdir) $(all_includes) $(AVAHI_CFLAGS)
+
+ # these are the headers for your project
+ noinst_HEADERS = sdevent.h
+@@ -533,7 +557,8 @@
+ dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
+ publicservice.h servicebase.h servicebrowser.h settings.h
+
+-libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(LIB_DNSSD)
++libkdnssd_la_CXXFLAGS = $(INCLUDES)
++libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(AVAHI_LIBS)
+ libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+ #>- all: all-am
+ #>+ 1
+@@ -541,7 +566,7 @@
+
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
@@ -13330,7 +16560,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,16 +604,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13342,9 +16572,415 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -596,8 +621,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -619,35 +644,311 @@
+ distclean-compile:
+ -rm -f *.tab.c
+
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/domainbrowser.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/publicservice.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/query.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/remoteservice.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/responder.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/servicebase.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/servicebrowser.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkdnssd_la-domainbrowser.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkdnssd_la-publicservice.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkdnssd_la-query.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkdnssd_la-remoteservice.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkdnssd_la-responder.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkdnssd_la-servicebase.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkdnssd_la-servicebrowser.Plo at am__quote@
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
++libkdnssd_la-remoteservice.o: remoteservice.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-remoteservice.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.o `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-remoteservice.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.o `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='remoteservice.cpp' object='libkdnssd_la-remoteservice.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-remoteservice.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-remoteservice.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-remoteservice.o `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-remoteservice.o `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp
++
++libkdnssd_la-remoteservice.obj: remoteservice.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-remoteservice.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.obj `if test -f 'remoteservice.cpp'; then $(CYGPATH_W) 'remoteservice.cpp'; else $(CYGPATH_W) '$(srcdir)/remoteservice.cpp'; fi`; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-remoteservice.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.obj `if test -f 'remoteservice.cpp'; then $(CYGPATH_W) 'remoteservice.cpp'; else $(CYGPATH_W) '$(srcdir)/remoteservice.cpp'; fi`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='remoteservice.cpp' object='libkdnssd_la-remoteservice.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-remoteservice.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-remoteservice.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-remoteservice.obj `if test -f 'remoteservice.cpp'; then $(CYGPATH_W) 'remoteservice.cpp'; else $(CYGPATH_W) '$(srcdir)/remoteservice.cpp'; fi`
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-remoteservice.obj `if test -f 'remoteservice.cpp'; then $(CYGPATH_W) 'remoteservice.cpp'; else $(CYGPATH_W) '$(srcdir)/remoteservice.cpp'; fi`
++
++libkdnssd_la-remoteservice.lo: remoteservice.cpp
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-remoteservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-remoteservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo" "$(DEPDIR)/libkdnssd_la-remoteservice.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-remoteservice.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='remoteservice.cpp' object='libkdnssd_la-remoteservice.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-remoteservice.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-remoteservice.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-remoteservice.lo `test -f 'remoteservice.cpp' || echo '$(srcdir)/'`remoteservice.cpp
++
++libkdnssd_la-responder.o: responder.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-responder.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.o `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-responder.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.o `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='responder.cpp' object='libkdnssd_la-responder.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-responder.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-responder.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-responder.o `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-responder.o `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp
++
++libkdnssd_la-responder.obj: responder.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-responder.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.obj `if test -f 'responder.cpp'; then $(CYGPATH_W) 'responder.cpp'; else $(CYGPATH_W) '$(srcdir)/responder.cpp'; fi`; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-responder.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.obj `if test -f 'responder.cpp'; then $(CYGPATH_W) 'responder.cpp'; else $(CYGPATH_W) '$(srcdir)/responder.cpp'; fi`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='responder.cpp' object='libkdnssd_la-responder.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-responder.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-responder.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-responder.obj `if test -f 'responder.cpp'; then $(CYGPATH_W) 'responder.cpp'; else $(CYGPATH_W) '$(srcdir)/responder.cpp'; fi`
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-responder.obj `if test -f 'responder.cpp'; then $(CYGPATH_W) 'responder.cpp'; else $(CYGPATH_W) '$(srcdir)/responder.cpp'; fi`
++
++libkdnssd_la-responder.lo: responder.cpp
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-responder.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-responder.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-responder.Tpo" -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-responder.Tpo" "$(DEPDIR)/libkdnssd_la-responder.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-responder.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='responder.cpp' object='libkdnssd_la-responder.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-responder.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-responder.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-responder.lo `test -f 'responder.cpp' || echo '$(srcdir)/'`responder.cpp
++
++libkdnssd_la-servicebase.o: servicebase.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebase.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.o `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebase.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.o `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebase.cpp' object='libkdnssd_la-servicebase.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebase.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebase.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebase.o `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebase.o `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp
++
++libkdnssd_la-servicebase.obj: servicebase.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebase.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.obj `if test -f 'servicebase.cpp'; then $(CYGPATH_W) 'servicebase.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebase.cpp'; fi`; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebase.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.obj `if test -f 'servicebase.cpp'; then $(CYGPATH_W) 'servicebase.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebase.cpp'; fi`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebase.cpp' object='libkdnssd_la-servicebase.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebase.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebase.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebase.obj `if test -f 'servicebase.cpp'; then $(CYGPATH_W) 'servicebase.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebase.cpp'; fi`
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebase.obj `if test -f 'servicebase.cpp'; then $(CYGPATH_W) 'servicebase.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebase.cpp'; fi`
++
++libkdnssd_la-servicebase.lo: servicebase.cpp
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebase.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebase.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo" "$(DEPDIR)/libkdnssd_la-servicebase.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebase.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebase.cpp' object='libkdnssd_la-servicebase.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebase.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebase.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebase.lo `test -f 'servicebase.cpp' || echo '$(srcdir)/'`servicebase.cpp
++
++libkdnssd_la-publicservice.o: publicservice.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-publicservice.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.o `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-publicservice.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.o `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='publicservice.cpp' object='libkdnssd_la-publicservice.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-publicservice.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-publicservice.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-publicservice.o `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-publicservice.o `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp
++
++libkdnssd_la-publicservice.obj: publicservice.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-publicservice.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.obj `if test -f 'publicservice.cpp'; then $(CYGPATH_W) 'publicservice.cpp'; else $(CYGPATH_W) '$(srcdir)/publicservice.cpp'; fi`; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-publicservice.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.obj `if test -f 'publicservice.cpp'; then $(CYGPATH_W) 'publicservice.cpp'; else $(CYGPATH_W) '$(srcdir)/publicservice.cpp'; fi`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='publicservice.cpp' object='libkdnssd_la-publicservice.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-publicservice.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-publicservice.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-publicservice.obj `if test -f 'publicservice.cpp'; then $(CYGPATH_W) 'publicservice.cpp'; else $(CYGPATH_W) '$(srcdir)/publicservice.cpp'; fi`
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-publicservice.obj `if test -f 'publicservice.cpp'; then $(CYGPATH_W) 'publicservice.cpp'; else $(CYGPATH_W) '$(srcdir)/publicservice.cpp'; fi`
++
++libkdnssd_la-publicservice.lo: publicservice.cpp
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-publicservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-publicservice.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo" "$(DEPDIR)/libkdnssd_la-publicservice.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-publicservice.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='publicservice.cpp' object='libkdnssd_la-publicservice.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-publicservice.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-publicservice.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-publicservice.lo `test -f 'publicservice.cpp' || echo '$(srcdir)/'`publicservice.cpp
++
++libkdnssd_la-query.o: query.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-query.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.o `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-query.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.o `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='query.cpp' object='libkdnssd_la-query.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-query.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-query.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-query.o `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-query.o `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp
++
++libkdnssd_la-query.obj: query.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-query.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.obj `if test -f 'query.cpp'; then $(CYGPATH_W) 'query.cpp'; else $(CYGPATH_W) '$(srcdir)/query.cpp'; fi`; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-query.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.obj `if test -f 'query.cpp'; then $(CYGPATH_W) 'query.cpp'; else $(CYGPATH_W) '$(srcdir)/query.cpp'; fi`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='query.cpp' object='libkdnssd_la-query.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-query.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-query.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-query.obj `if test -f 'query.cpp'; then $(CYGPATH_W) 'query.cpp'; else $(CYGPATH_W) '$(srcdir)/query.cpp'; fi`
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-query.obj `if test -f 'query.cpp'; then $(CYGPATH_W) 'query.cpp'; else $(CYGPATH_W) '$(srcdir)/query.cpp'; fi`
++
++libkdnssd_la-query.lo: query.cpp
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-query.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-query.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-query.Tpo" -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-query.Tpo" "$(DEPDIR)/libkdnssd_la-query.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-query.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='query.cpp' object='libkdnssd_la-query.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-query.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-query.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-query.lo `test -f 'query.cpp' || echo '$(srcdir)/'`query.cpp
++
++libkdnssd_la-domainbrowser.o: domainbrowser.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-domainbrowser.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.o `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-domainbrowser.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.o `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='domainbrowser.cpp' object='libkdnssd_la-domainbrowser.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-domainbrowser.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-domainbrowser.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-domainbrowser.o `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-domainbrowser.o `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp
++
++libkdnssd_la-domainbrowser.obj: domainbrowser.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-domainbrowser.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.obj `if test -f 'domainbrowser.cpp'; then $(CYGPATH_W) 'domainbrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/domainbrowser.cpp'; fi`; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-domainbrowser.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.obj `if test -f 'domainbrowser.cpp'; then $(CYGPATH_W) 'domainbrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/domainbrowser.cpp'; fi`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='domainbrowser.cpp' object='libkdnssd_la-domainbrowser.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-domainbrowser.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-domainbrowser.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-domainbrowser.obj `if test -f 'domainbrowser.cpp'; then $(CYGPATH_W) 'domainbrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/domainbrowser.cpp'; fi`
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-domainbrowser.obj `if test -f 'domainbrowser.cpp'; then $(CYGPATH_W) 'domainbrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/domainbrowser.cpp'; fi`
++
++libkdnssd_la-domainbrowser.lo: domainbrowser.cpp
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-domainbrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-domainbrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo" "$(DEPDIR)/libkdnssd_la-domainbrowser.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-domainbrowser.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='domainbrowser.cpp' object='libkdnssd_la-domainbrowser.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-domainbrowser.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-domainbrowser.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-domainbrowser.lo `test -f 'domainbrowser.cpp' || echo '$(srcdir)/'`domainbrowser.cpp
++
++libkdnssd_la-servicebrowser.o: servicebrowser.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebrowser.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.o `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebrowser.o -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.o `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebrowser.cpp' object='libkdnssd_la-servicebrowser.o' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebrowser.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebrowser.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebrowser.o `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebrowser.o `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp
++
++libkdnssd_la-servicebrowser.obj: servicebrowser.cpp
++#>- @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebrowser.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.obj `if test -f 'servicebrowser.cpp'; then $(CYGPATH_W) 'servicebrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebrowser.cpp'; fi`; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebrowser.obj -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.obj `if test -f 'servicebrowser.cpp'; then $(CYGPATH_W) 'servicebrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebrowser.cpp'; fi`; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Po"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebrowser.cpp' object='libkdnssd_la-servicebrowser.obj' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebrowser.Po' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebrowser.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebrowser.obj `if test -f 'servicebrowser.cpp'; then $(CYGPATH_W) 'servicebrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebrowser.cpp'; fi`
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebrowser.obj `if test -f 'servicebrowser.cpp'; then $(CYGPATH_W) 'servicebrowser.cpp'; else $(CYGPATH_W) '$(srcdir)/servicebrowser.cpp'; fi`
++
++libkdnssd_la-servicebrowser.lo: servicebrowser.cpp
++#>- @am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -MT libkdnssd_la-servicebrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp; \
++#>- @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
++#>+ 2
++ at am__fastdepCXX_TRUE@ if $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libkdnssd_la-servicebrowser.lo -MD -MP -MF "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp; \
++ at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo" "$(DEPDIR)/libkdnssd_la-servicebrowser.Plo"; else rm -f "$(DEPDIR)/libkdnssd_la-servicebrowser.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='servicebrowser.cpp' object='libkdnssd_la-servicebrowser.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/libkdnssd_la-servicebrowser.Plo' tmpdepfile='$(DEPDIR)/libkdnssd_la-servicebrowser.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++#>- @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp
++#>+ 1
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkdnssd_la_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libkdnssd_la-servicebrowser.lo `test -f 'servicebrowser.cpp' || echo '$(srcdir)/'`servicebrowser.cpp
++
+ mostlyclean-libtool:
+ -rm -f *.lo
+
+@@ -662,7 +963,7 @@
+ test -z "$(dnssdincludedir)" || $(mkdir_p) "$(DESTDIR)$(dnssdincludedir)"
+ @list='$(dnssdinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(dnssdincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(dnssdincludedir)/$$f'"; \
+ $(dnssdincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(dnssdincludedir)/$$f"; \
+ done
+@@ -670,7 +971,7 @@
+ uninstall-dnssdincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dnssdinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(dnssdincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(dnssdincludedir)/$$f"; \
+ done
+@@ -777,7 +1078,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- doc/Makefile.in
+++ doc/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -84,6 +84,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -125,8 +127,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -203,7 +203,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13354,7 +16990,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -295,6 +297,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,8 +307,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -323,6 +324,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -485,7 +487,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13363,7 +17024,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -523,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13375,9 +17036,139 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -545,13 +547,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -563,7 +559,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -571,13 +567,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -598,7 +588,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -697,17 +687,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -736,7 +724,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- doc/common/Makefile.in
+++ doc/common/Makefile.in
-@@ -238,6 +238,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -58,12 +58,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(commondir)"
+ commonDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(common_DATA)
+@@ -82,6 +76,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -123,8 +119,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -201,7 +195,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -238,6 +231,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13387,7 +17178,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -293,6 +289,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -302,8 +299,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -321,6 +316,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -498,7 +494,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13396,7 +17212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -536,9 +532,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13408,7 +17224,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -697,7 +700,7 @@
+@@ -555,7 +551,7 @@
+ test -z "$(commondir)" || $(mkdir_p) "$(DESTDIR)$(commondir)"
+ @list='$(common_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(commonDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(commondir)/$$f'"; \
+ $(commonDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(commondir)/$$f"; \
+ done
+@@ -563,7 +559,7 @@
+ uninstall-commonDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(common_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(commondir)/$$f'"; \
+ rm -f "$(DESTDIR)$(commondir)/$$f"; \
+ done
+@@ -627,7 +623,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -697,7 +693,7 @@
.NOEXPORT:
#>+ 2
@@ -13419,7 +17262,45 @@
docs-am:
--- doc/kdelibs/Makefile.in
+++ doc/kdelibs/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -68,6 +68,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -109,8 +111,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -187,7 +187,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -224,6 +223,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13429,7 +17310,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -279,6 +281,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -288,8 +291,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -307,6 +308,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -472,7 +474,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13438,7 +17344,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -510,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13450,7 +17356,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -651,7 +654,7 @@
+@@ -581,7 +583,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -651,7 +653,7 @@
.NOEXPORT:
#>+ 2
@@ -13461,7 +17376,45 @@
docs-am:
--- doc/kspell/Makefile.in
+++ doc/kspell/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -68,6 +68,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -109,8 +111,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -187,7 +187,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -224,6 +223,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13471,7 +17424,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -279,6 +281,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -288,8 +291,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -307,6 +308,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -471,7 +473,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13480,7 +17458,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -509,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13492,9 +17470,56 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -584,7 +586,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/Makefile.in
+++ interfaces/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -85,6 +85,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -126,8 +128,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -204,7 +204,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -241,6 +240,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13504,7 +17529,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -296,6 +298,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +308,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -324,6 +325,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -488,7 +490,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13513,7 +17563,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -526,9 +528,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13525,9 +17575,142 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -548,13 +550,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -566,7 +562,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -574,13 +570,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -601,7 +591,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -701,17 +691,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -740,7 +728,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/khexedit/Makefile.in
+++ interfaces/khexedit/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -56,14 +56,7 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(servicetypedir)" \
+- "$(DESTDIR)$(khexeditincludedir)"
++am__installdirs = "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(khexeditincludedir)"
+ servicetypeDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(servicetype_DATA)
+ khexeditincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -85,6 +78,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -126,8 +121,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -204,7 +197,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -241,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13537,7 +17720,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -296,6 +291,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +301,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -324,6 +318,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -497,7 +492,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13546,7 +17754,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13558,9 +17766,92 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -554,7 +549,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -562,7 +557,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -571,7 +566,7 @@
+ test -z "$(khexeditincludedir)" || $(mkdir_p) "$(DESTDIR)$(khexeditincludedir)"
+ @list='$(khexeditinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(khexeditincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(khexeditincludedir)/$$f'"; \
+ $(khexeditincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(khexeditincludedir)/$$f"; \
+ done
+@@ -579,7 +574,7 @@
+ uninstall-khexeditincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(khexeditinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(khexeditincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(khexeditincludedir)/$$f"; \
+ done
+@@ -685,7 +680,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/kimproxy/Makefile.in
+++ interfaces/kimproxy/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -84,6 +84,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -125,8 +127,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -203,7 +203,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13570,7 +17861,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -295,6 +297,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,8 +307,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -323,6 +324,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -485,7 +487,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13579,7 +17895,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -523,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13591,9 +17907,143 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -545,13 +547,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -563,7 +559,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -571,13 +567,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -598,7 +588,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -697,17 +687,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -736,7 +724,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/kimproxy/interface/Makefile.in
+++ interfaces/kimproxy/interface/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -56,15 +56,7 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kcm_instantmessengerdir)" \
+- "$(DESTDIR)$(servicetypedir)" \
+- "$(DESTDIR)$(kimifaceincludedir)"
++am__installdirs = "$(DESTDIR)$(kcm_instantmessengerdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kimifaceincludedir)"
+ kcm_instantmessengerDATA_INSTALL = $(INSTALL_DATA)
+ servicetypeDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(kcm_instantmessenger_DATA) $(servicetype_DATA)
+@@ -87,6 +79,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -128,8 +122,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -206,7 +198,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -243,6 +234,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13603,7 +18053,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -495,7 +498,7 @@
+@@ -298,6 +292,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -307,8 +302,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -326,6 +319,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -495,7 +489,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13612,7 +18087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -533,9 +536,9 @@
+@@ -533,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13624,9 +18099,170 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -552,7 +546,7 @@
+ test -z "$(kcm_instantmessengerdir)" || $(mkdir_p) "$(DESTDIR)$(kcm_instantmessengerdir)"
+ @list='$(kcm_instantmessenger_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kcm_instantmessengerDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kcm_instantmessengerdir)/$$f'"; \
+ $(kcm_instantmessengerDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kcm_instantmessengerdir)/$$f"; \
+ done
+@@ -560,7 +554,7 @@
+ uninstall-kcm_instantmessengerDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kcm_instantmessenger_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kcm_instantmessengerdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kcm_instantmessengerdir)/$$f"; \
+ done
+@@ -569,7 +563,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -577,7 +571,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -586,7 +580,7 @@
+ test -z "$(kimifaceincludedir)" || $(mkdir_p) "$(DESTDIR)$(kimifaceincludedir)"
+ @list='$(kimifaceinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kimifaceincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kimifaceincludedir)/$$f'"; \
+ $(kimifaceincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kimifaceincludedir)/$$f"; \
+ done
+@@ -594,7 +588,7 @@
+ uninstall-kimifaceincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kimifaceinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kimifaceincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kimifaceincludedir)/$$f"; \
+ done
+@@ -701,7 +695,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/kimproxy/library/Makefile.in
+++ interfaces/kimproxy/library/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkimproxy_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(kimproxyincludedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kimproxyincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -77,24 +72,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kimproxy.Plo
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kimiface_stub.P $(DEPDIR)/kimproxyiface_skel.P $(DEPDIR)/libkimproxy_la.all_cpp.P ./$(DEPDIR)/kimproxy.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kimiface_stub.P $(DEPDIR)/kimproxyiface_skel.P ./$(DEPDIR)/kimproxy.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkimproxy_la_SOURCES)
+ DIST_SOURCES = $(libkimproxy_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -130,6 +129,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -171,8 +172,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -249,7 +248,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -286,6 +284,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13636,7 +18272,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -548,7 +551,7 @@
+@@ -341,6 +342,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,8 +352,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -369,6 +369,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -548,7 +549,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13645,7 +18306,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +589,9 @@
+@@ -586,16 +587,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13657,9 +18318,191 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -603,8 +604,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -635,21 +636,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -666,7 +670,7 @@
+ test -z "$(kimproxyincludedir)" || $(mkdir_p) "$(DESTDIR)$(kimproxyincludedir)"
+ @list='$(kimproxyinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kimproxyincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kimproxyincludedir)/$$f'"; \
+ $(kimproxyincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kimproxyincludedir)/$$f"; \
+ done
+@@ -674,7 +678,7 @@
+ uninstall-kimproxyincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kimproxyinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kimproxyincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kimproxyincludedir)/$$f"; \
+ done
+@@ -686,13 +690,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -704,7 +702,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -712,13 +710,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -739,7 +731,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -839,17 +831,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -881,7 +871,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/kimproxy/library/icons/Makefile.in
+++ interfaces/kimproxy/library/icons/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -68,6 +68,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -109,8 +111,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -187,7 +187,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -224,6 +223,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13669,7 +18512,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -279,6 +281,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -288,8 +291,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -307,6 +308,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -469,7 +471,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13678,7 +18546,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -507,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13690,8 +18558,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -659,33 +662,33 @@
+@@ -578,7 +580,7 @@
+ clean-generic:
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -659,33 +661,33 @@
+
#>+ 29
install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
@@ -13739,7 +18616,58 @@
force-reedit:
--- interfaces/kio/Makefile.in
+++ interfaces/kio/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -55,12 +55,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kioincludedir)"
+ kioincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(kioinclude_HEADERS)
+@@ -81,6 +75,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -122,8 +118,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -200,7 +194,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -237,6 +230,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13749,7 +18677,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -292,6 +288,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -301,8 +298,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -320,6 +315,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -483,7 +479,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13758,7 +18711,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13770,9 +18723,135 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -540,7 +536,7 @@
+ test -z "$(kioincludedir)" || $(mkdir_p) "$(DESTDIR)$(kioincludedir)"
+ @list='$(kioinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kioincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kioincludedir)/$$f'"; \
+ $(kioincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kioincludedir)/$$f"; \
+ done
+@@ -548,7 +544,7 @@
+ uninstall-kioincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kioinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kioincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kioincludedir)/$$f"; \
+ done
+@@ -654,7 +650,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/kmediaplayer/Makefile.in
+++ interfaces/kmediaplayer/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(libkmediaplayer_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,15 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(kde_servicetypesdir)" \
+- "$(DESTDIR)$(kmediaplayerincludedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(kmediaplayerincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -78,24 +72,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/player.Plo ./$(DEPDIR)/view.Plo
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/playerdcopobject_skel.P $(DEPDIR)/libkmediaplayer_la.all_cpp.P ./$(DEPDIR)/player.Plo ./$(DEPDIR)/view.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/playerdcopobject_skel.P ./$(DEPDIR)/player.Plo ./$(DEPDIR)/view.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkmediaplayer_la_SOURCES)
+ DIST_SOURCES = $(libkmediaplayer_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -133,6 +131,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -174,8 +174,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -252,7 +250,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -289,6 +286,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13782,7 +18861,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -549,7 +552,7 @@
+@@ -344,6 +344,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -353,8 +354,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -372,6 +371,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -549,7 +549,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13791,7 +18895,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +590,9 @@
+@@ -587,16 +587,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13803,9 +18907,261 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -604,8 +604,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -637,21 +637,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -668,7 +671,7 @@
+ test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
+ @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicetypesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
+ $(kde_servicetypesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
+ done
+@@ -676,7 +679,7 @@
+ uninstall-kde_servicetypesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
+ done
+@@ -685,7 +688,7 @@
+ test -z "$(kmediaplayerincludedir)" || $(mkdir_p) "$(DESTDIR)$(kmediaplayerincludedir)"
+ @list='$(kmediaplayerinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kmediaplayerincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kmediaplayerincludedir)/$$f'"; \
+ $(kmediaplayerincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kmediaplayerincludedir)/$$f"; \
+ done
+@@ -693,7 +696,7 @@
+ uninstall-kmediaplayerincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kmediaplayerinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kmediaplayerincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kmediaplayerincludedir)/$$f"; \
+ done
+@@ -705,13 +708,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -723,7 +720,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -731,13 +728,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -758,7 +749,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -860,14 +851,12 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -899,7 +888,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
+++ interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(kfileaudiopreview_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_moduledir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+@@ -74,24 +70,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kfileaudiopreview.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kfileaudiopreview.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kfileaudiopreview_la_SOURCES)
+ DIST_SOURCES = $(kfileaudiopreview_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -112,6 +111,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -153,8 +154,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -231,7 +230,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13815,7 +19171,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,7 @@
+@@ -323,6 +324,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +334,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -351,6 +351,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -522,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13824,7 +19205,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -560,9 +563,9 @@
+@@ -560,16 +561,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13836,9 +19217,119 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -577,8 +578,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -609,21 +610,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -737,7 +741,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/kregexpeditor/Makefile.in
+++ interfaces/kregexpeditor/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -58,14 +58,7 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(servicetypedir)" \
+- "$(DESTDIR)$(includedir)"
++am__installdirs = "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(includedir)"
+ servicetypeDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(servicetype_DATA)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -87,6 +80,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -128,8 +123,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -206,7 +199,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -243,6 +235,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13848,7 +19339,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -298,6 +293,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -307,8 +303,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -326,6 +320,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -492,7 +487,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13857,7 +19373,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -530,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13869,9 +19385,152 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -549,7 +544,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -557,7 +552,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -566,7 +561,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -574,7 +569,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -680,7 +675,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/kscript/Makefile.in
+++ interfaces/kscript/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(libkscript_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" \
+- "$(DESTDIR)$(kscriptincludedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kscriptincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -78,24 +73,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/scriptmanager.Plo
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/scriptclientinterface.moc.P $(DEPDIR)/libkscript_la.all_cpp.P ./$(DEPDIR)/scriptmanager.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/scriptclientinterface.moc.P ./$(DEPDIR)/scriptmanager.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkscript_la_SOURCES)
+ DIST_SOURCES = $(libkscript_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -133,6 +132,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -174,8 +175,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -252,7 +251,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -289,6 +287,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13881,7 +19540,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -344,6 +345,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -353,8 +355,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -372,6 +372,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -552,7 +553,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13890,7 +19574,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,16 +591,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13902,9 +19586,268 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -607,8 +608,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -639,21 +640,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -670,7 +674,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -678,7 +682,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -687,7 +691,7 @@
+ test -z "$(kscriptincludedir)" || $(mkdir_p) "$(DESTDIR)$(kscriptincludedir)"
+ @list='$(kscriptinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kscriptincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kscriptincludedir)/$$f'"; \
+ $(kscriptincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kscriptincludedir)/$$f"; \
+ done
+@@ -695,7 +699,7 @@
+ uninstall-kscriptincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kscriptinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kscriptincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kscriptincludedir)/$$f"; \
+ done
+@@ -707,13 +711,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -725,7 +723,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -733,13 +731,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -760,7 +752,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -859,17 +851,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -901,7 +891,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/kscript/sample/Makefile.in
+++ interfaces/kscript/sample/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libshellscript_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicetypedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicetypedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ libshellscript_la_DEPENDENCIES = ../libkscript.la
+@@ -71,24 +66,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/shellscript.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/shellscript.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libshellscript_la_SOURCES)
+ DIST_SOURCES = $(libshellscript_la_SOURCES)
+ servicetypeDATA_INSTALL = $(INSTALL_DATA)
+@@ -110,6 +108,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -151,8 +151,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -229,7 +227,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -266,6 +263,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13914,7 +19857,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,7 +524,7 @@
+@@ -321,6 +321,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -330,8 +331,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -349,6 +348,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -521,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13923,7 +19891,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +562,9 @@
+@@ -559,16 +559,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13935,9 +19903,137 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -576,8 +576,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -608,21 +608,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -639,7 +642,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -647,7 +650,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -753,7 +756,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/kspeech/Makefile.in
+++ interfaces/kspeech/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -56,14 +56,7 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_servicetypesdir)" \
+- "$(DESTDIR)$(includedir)"
++am__installdirs = "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(includedir)"
+ kde_servicetypesDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(kde_servicetypes_DATA)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -85,6 +78,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -126,8 +121,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -204,7 +197,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -241,6 +233,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13947,7 +20043,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -296,6 +291,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +301,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -324,6 +318,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -493,7 +488,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -13956,7 +20077,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -531,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13968,9 +20089,271 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -550,7 +545,7 @@
+ test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
+ @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicetypesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
+ $(kde_servicetypesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
+ done
+@@ -558,7 +553,7 @@
+ uninstall-kde_servicetypesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
+ done
+@@ -567,7 +562,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -575,7 +570,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -682,7 +677,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/ktexteditor/Makefile.in
+++ interfaces/ktexteditor/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(libktexteditor_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -56,16 +58,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(kcm_ktexteditordir)" \
+- "$(DESTDIR)$(servicetypedir)" \
+- "$(DESTDIR)$(ktexteditorincludedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kcm_ktexteditordir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(ktexteditorincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -116,24 +109,145 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/blockselectiondcopinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/blockselectioninterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/clipboarddcopinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/clipboardinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/codecompletioninterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/configinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/configinterfaceextension.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cursorinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/documentdcopinfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/documentinfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dynwordwrapinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/editdcopinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/editinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/editinterfaceext.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/editorchooser.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/encodingdcopinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/encodinginterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/highlightinginterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktexteditor.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/markinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/markinterfaceextension.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/popupmenuinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/printdcopinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/printinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/searchdcopinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/searchinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/selectiondcopinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterfaceext.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/sessionconfiginterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/templateinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/texthintinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/undodcopinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/undointerface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/variableinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/viewcursordcopinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/viewcursorinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsgdcopinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsginterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/wordwrapinterface.Plo
++#>+ 80
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/editdcopinterface_skel.P $(DEPDIR)/clipboarddcopinterface_skel.P $(DEPDIR)/selectiondcopinterface_skel.P $(DEPDIR)/searchdcopinterface_skel.P $(DEPDIR)/blockselectiondcopinterface_skel.P $(DEPDIR)/documentdcopinfo_skel.P $(DEPDIR)/encodingdcopinterface_skel.P $(DEPDIR)/printdcopinterface_skel.P $(DEPDIR)/undodcopinterface_skel.P $(DEPDIR)/viewcursordcopinterface_skel.P $(DEPDIR)/viewstatusmsgdcopinterface_skel.P $(DEPDIR)/selectionextdcopinterface_skel.P $(DEPDIR)/editorchooser_ui.P $(DEPDIR)/libktexteditor_la.all_cpp.P ./$(DEPDIR)/blockselectiondcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/blockselectioninterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/clipboarddcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/clipboardinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/codecompletioninterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configinterfaceextension.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cursorinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentdcopinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dynwordwrapinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editdcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editinterfaceext.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editorchooser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/encodingdcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/encodinginterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/highlightinginterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktexteditor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/markinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/markinterfaceextension.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/popupmenuinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printdcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/searchdcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/searchinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectiondcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterfaceext.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sessionconfiginterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/templateinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/texthintinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/undodcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/undointerface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/variableinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewcursordcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewcursorinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsgdcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsginterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/wordwrapinterface.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/editdcopinterface_skel.P $(DEPDIR)/clipboarddcopinterface_skel.P $(DEPDIR)/selectiondcopinterface_skel.P $(DEPDIR)/searchdcopinterface_skel.P $(DEPDIR)/blockselectiondcopinterface_skel.P $(DEPDIR)/documentdcopinfo_skel.P $(DEPDIR)/encodingdcopinterface_skel.P $(DEPDIR)/printdcopinterface_skel.P $(DEPDIR)/undodcopinterface_skel.P $(DEPDIR)/viewcursordcopinterface_skel.P $(DEPDIR)/viewstatusmsgdcopinterface_skel.P $(DEPDIR)/selectionextdcopinterface_skel.P $(DEPDIR)/editorchooser_ui.P ./$(DEPDIR)/blockselectiondcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/blockselectioninterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/clipboarddcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/clipboardinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/codecompletioninterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configinterfaceextension.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cursorinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentdcopinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/documentinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dynwordwrapinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editdcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editinterfaceext.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editorchooser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/encodingdcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/encodinginterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/highlightinginterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktexteditor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/markinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/markinterfaceextension.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/popupmenuinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printdcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/searchdcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/searchinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectiondcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectioninterfaceext.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sessionconfiginterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/templateinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/texthintinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/undodcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/undointerface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/variableinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewcursordcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewcursorinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsgdcopinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/viewstatusmsginterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/wordwrapinterface.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libktexteditor_la_SOURCES)
+ DIST_SOURCES = $(libktexteditor_la_SOURCES)
+ kcm_ktexteditorDATA_INSTALL = $(INSTALL_DATA)
+@@ -158,6 +272,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -199,8 +315,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -277,7 +391,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -314,6 +427,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -13980,7 +20363,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -618,7 +621,7 @@
+@@ -369,6 +485,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -378,8 +495,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -397,6 +512,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -618,7 +734,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13989,7 +20397,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -656,9 +659,9 @@
+@@ -656,16 +772,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14001,7 +20409,117 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1179,22 +1182,22 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -673,8 +789,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -741,21 +857,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -772,7 +891,7 @@
+ test -z "$(kcm_ktexteditordir)" || $(mkdir_p) "$(DESTDIR)$(kcm_ktexteditordir)"
+ @list='$(kcm_ktexteditor_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kcm_ktexteditorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kcm_ktexteditordir)/$$f'"; \
+ $(kcm_ktexteditorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kcm_ktexteditordir)/$$f"; \
+ done
+@@ -780,7 +899,7 @@
+ uninstall-kcm_ktexteditorDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kcm_ktexteditor_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kcm_ktexteditordir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kcm_ktexteditordir)/$$f"; \
+ done
+@@ -789,7 +908,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -797,7 +916,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -806,7 +925,7 @@
+ test -z "$(ktexteditorincludedir)" || $(mkdir_p) "$(DESTDIR)$(ktexteditorincludedir)"
+ @list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(ktexteditorincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ktexteditorincludedir)/$$f'"; \
+ $(ktexteditorincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ktexteditorincludedir)/$$f"; \
+ done
+@@ -814,7 +933,7 @@
+ uninstall-ktexteditorincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(ktexteditorincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(ktexteditorincludedir)/$$f"; \
+ done
+@@ -921,7 +1040,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1179,22 +1298,22 @@
mocs: view.moc
#>+ 3
@@ -14031,7 +20549,7 @@
#>+ 2
KDE_DIST=ktexteditorplugin.desktop undodcopinterface.h viewstatusmsgdcopinterface.h ktexteditoreditor.desktop viewcursordcopinterface.h searchdcopinterface.h documentdcopinfo.h kcm_ktexteditor.desktop ktexteditor.desktop editorchooser_ui.ui editdcopinterface.h clipboarddcopinterface.h Makefile.in blockselectiondcopinterface.h encodingdcopinterface.h printdcopinterface.h selectiondcopinterface.h Makefile.am
-@@ -1262,7 +1265,7 @@
+@@ -1262,7 +1381,7 @@
#>+ 11
@@ -14042,7 +20560,58 @@
echo "#define KDE_USE_FINAL 1" >> libktexteditor_la.all_cpp.final; \
--- interfaces/terminal/Makefile.in
+++ interfaces/terminal/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -55,12 +55,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(ktexteditorincludedir)"
+ ktexteditorincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(ktexteditorinclude_HEADERS)
+@@ -81,6 +75,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -122,8 +118,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -200,7 +194,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -237,6 +230,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14052,7 +20621,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -292,6 +288,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -301,8 +298,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -320,6 +315,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -483,7 +479,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14061,7 +20655,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14073,9 +20667,117 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -540,7 +536,7 @@
+ test -z "$(ktexteditorincludedir)" || $(mkdir_p) "$(DESTDIR)$(ktexteditorincludedir)"
+ @list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(ktexteditorincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ktexteditorincludedir)/$$f'"; \
+ $(ktexteditorincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ktexteditorincludedir)/$$f"; \
+ done
+@@ -548,7 +544,7 @@
+ uninstall-ktexteditorincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(ktexteditorinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(ktexteditorincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(ktexteditorincludedir)/$$f"; \
+ done
+@@ -654,7 +650,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- interfaces/terminal/test/Makefile.in
+++ interfaces/terminal/test/Makefile.in
-@@ -255,6 +255,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(test_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -62,24 +64,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/main.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(test_SOURCES)
+ DIST_SOURCES = $(test_SOURCES)
+ ETAGS = etags
+@@ -99,6 +104,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -140,8 +147,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -218,7 +223,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -255,6 +259,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14085,7 +20787,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,7 +508,7 @@
+@@ -310,6 +317,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -319,8 +327,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -338,6 +344,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -505,7 +512,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14094,7 +20821,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -543,9 +546,9 @@
+@@ -543,9 +550,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14106,9 +20833,131 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -570,21 +577,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -696,7 +706,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kab/Makefile.in
+++ kab/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(libkab_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -65,24 +67,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/addressbook.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kabapi.Plo ./$(DEPDIR)/qconfigDB.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkab_la.all_cc.P ./$(DEPDIR)/addressbook.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kabapi.Plo ./$(DEPDIR)/qconfigDB.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/addressbook.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kabapi.Plo ./$(DEPDIR)/qconfigDB.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkab_la_SOURCES)
+ DIST_SOURCES = $(libkab_la_SOURCES)
+ ETAGS = etags
+@@ -102,6 +111,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -143,8 +154,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -221,7 +230,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -258,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14118,7 +20967,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -313,6 +324,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -322,8 +334,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -341,6 +351,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -517,7 +528,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -14127,7 +21001,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +566,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14139,9 +21013,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -800,18 +803,18 @@
+@@ -588,21 +599,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -713,7 +727,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -800,18 +814,18 @@
+
+
#>+ 3
-kabapi.moc: $(srcdir)/kabapi.h
- $(MOC) $(srcdir)/kabapi.h -o kabapi.moc
@@ -14164,7 +21075,7 @@
#>+ 3
addressbook.moc: $(srcdir)/addressbook.h
-@@ -822,7 +825,7 @@
+@@ -822,7 +836,7 @@
#>+ 3
clean-metasources:
@@ -14173,7 +21084,7 @@
#>+ 2
KDE_DIST=README.KABAPI template.kab template.config addressbook.h README.FORMAT kabapi.h Makefile.in qconfigDB.h Makefile.am
-@@ -873,7 +876,7 @@
+@@ -873,7 +887,7 @@
#>+ 11
@@ -14184,7 +21095,202 @@
echo "#define KDE_USE_FINAL 1" >> libkab_la.all_cc.final; \
--- kabc/Makefile.in
+++ kabc/Makefile.in
-@@ -323,6 +323,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,8 @@
+
+
+
++SOURCES = $(libkabc_la_SOURCES) $(kab2kabc_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -58,15 +60,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(managerdir)" \
+- "$(DESTDIR)$(mapdir)" "$(DESTDIR)$(kabcincludedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(managerdir)" "$(DESTDIR)$(mapdir)" "$(DESTDIR)$(kabcincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -110,24 +104,124 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/address.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/addressbook.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/addressee.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/addresseedialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/addresseehelper.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/addresseelist.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/addresslineedit.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/agent.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/distributionlist.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/distributionlistdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/distributionlisteditor.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/errorhandler.Plo ./$(DEPDIR)/field.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/formatfactory.Plo ./$(DEPDIR)/geo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kab2kabc.Po ./$(DEPDIR)/key.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ldapclient.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ldapconfigwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ldapurl.Plo ./$(DEPDIR)/ldif.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ldifconverter.Plo ./$(DEPDIR)/lock.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/locknull.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/phonenumber.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/picture.Plo ./$(DEPDIR)/plugin.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourceselectdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/secrecy.Plo ./$(DEPDIR)/sortmode.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/sound.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/stdaddressbook.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/timezone.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcard21parser.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardconverter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardformat.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatplugin.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardtool.Plo
++#>+ 66
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/addresseehelper_skel.P $(DEPDIR)/libkabc_la.all_cpp.P ./$(DEPDIR)/address.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addressbook.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addressee.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseedialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseehelper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseelist.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresslineedit.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/agent.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlist.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlistdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlisteditor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/errorhandler.Plo ./$(DEPDIR)/field.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/formatfactory.Plo ./$(DEPDIR)/geo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kab2kabc.Po ./$(DEPDIR)/key.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapconfigwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapurl.Plo ./$(DEPDIR)/ldif.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldifconverter.Plo ./$(DEPDIR)/lock.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/locknull.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/phonenumber.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/picture.Plo ./$(DEPDIR)/plugin.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceselectdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/secrecy.Plo ./$(DEPDIR)/sortmode.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sound.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/stdaddressbook.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/timezone.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcard21parser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardconverter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformat.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatplugin.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardtool.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/addresseehelper_skel.P ./$(DEPDIR)/address.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addressbook.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addressee.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseedialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseehelper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresseelist.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/addresslineedit.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/agent.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlist.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlistdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/distributionlisteditor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/errorhandler.Plo ./$(DEPDIR)/field.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/formatfactory.Plo ./$(DEPDIR)/geo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kab2kabc.Po ./$(DEPDIR)/key.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapconfigwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldapurl.Plo ./$(DEPDIR)/ldif.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ldifconverter.Plo ./$(DEPDIR)/lock.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/locknull.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/phonenumber.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/picture.Plo ./$(DEPDIR)/plugin.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceselectdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/secrecy.Plo ./$(DEPDIR)/sortmode.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sound.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/stdaddressbook.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/timezone.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcard21parser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardconverter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformat.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardformatplugin.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardtool.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkabc_la_SOURCES) $(kab2kabc_SOURCES)
+ DIST_SOURCES = $(libkabc_la_SOURCES) $(kab2kabc_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -167,6 +261,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -208,8 +304,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -286,7 +380,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -323,6 +416,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14194,7 +21300,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -631,7 +634,7 @@
+@@ -378,6 +474,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -387,8 +484,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -406,6 +501,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -631,7 +727,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14203,7 +21334,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -669,9 +672,9 @@
+@@ -669,16 +765,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14215,7 +21346,205 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1319,18 +1322,18 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -686,8 +782,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -788,21 +884,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -819,7 +918,7 @@
+ test -z "$(autostartdir)" || $(mkdir_p) "$(DESTDIR)$(autostartdir)"
+ @list='$(autostart_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(autostartDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(autostartdir)/$$f'"; \
+ $(autostartDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(autostartdir)/$$f"; \
+ done
+@@ -827,7 +926,7 @@
+ uninstall-autostartDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(autostart_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(autostartdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(autostartdir)/$$f"; \
+ done
+@@ -836,7 +935,7 @@
+ test -z "$(managerdir)" || $(mkdir_p) "$(DESTDIR)$(managerdir)"
+ @list='$(manager_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(managerDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(managerdir)/$$f'"; \
+ $(managerDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(managerdir)/$$f"; \
+ done
+@@ -844,7 +943,7 @@
+ uninstall-managerDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(manager_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(managerdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(managerdir)/$$f"; \
+ done
+@@ -853,7 +952,7 @@
+ test -z "$(mapdir)" || $(mkdir_p) "$(DESTDIR)$(mapdir)"
+ @list='$(map_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mapdir)/$$f'"; \
+ $(mapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mapdir)/$$f"; \
+ done
+@@ -861,7 +960,7 @@
+ uninstall-mapDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(map_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mapdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mapdir)/$$f"; \
+ done
+@@ -870,7 +969,7 @@
+ test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
+ @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kabcincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kabcincludedir)/$$f'"; \
+ $(kabcincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kabcincludedir)/$$f"; \
+ done
+@@ -878,7 +977,7 @@
+ uninstall-kabcincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kabcincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kabcincludedir)/$$f"; \
+ done
+@@ -890,13 +989,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -908,7 +1001,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -916,13 +1009,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -943,7 +1030,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1043,17 +1130,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1088,7 +1173,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1319,18 +1404,18 @@
mocs: resourceselectdialog.moc
#>+ 3
@@ -14240,7 +21569,7 @@
#>+ 3
distributionlisteditor.moc: $(srcdir)/distributionlisteditor.h
-@@ -1347,18 +1350,18 @@
+@@ -1347,18 +1432,18 @@
mocs: addresslineedit.moc
#>+ 3
@@ -14265,7 +21594,7 @@
#>+ 3
distributionlistdialog.moc: $(srcdir)/distributionlistdialog.h
-@@ -1383,7 +1386,7 @@
+@@ -1383,7 +1468,7 @@
#>+ 3
clean-metasources:
@@ -14274,7 +21603,7 @@
#>+ 2
KDE_DIST=vcard21parser.h HACKING kabc_manager.desktop README.AddressFormat HOWTO vcardtool.h addresseehelper.h countrytransl.map Makefile.in vcardformatimpl.h kab2kabc.desktop Makefile.am
-@@ -1439,7 +1442,7 @@
+@@ -1439,7 +1524,7 @@
#>+ 11
@@ -14285,7 +21614,101 @@
echo "#define KDE_USE_FINAL 1" >> libkabc_la.all_cpp.final; \
--- kabc/formats/Makefile.in
+++ kabc/formats/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kabcformat_binary_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,12 +57,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(linkdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+@@ -72,24 +68,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/binaryformat.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/binaryformat.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kabcformat_binary_la_SOURCES)
+ DIST_SOURCES = $(kabcformat_binary_la_SOURCES)
+ linkDATA_INSTALL = $(INSTALL_DATA)
+@@ -112,6 +111,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -153,8 +154,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -231,7 +230,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14295,7 +21718,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -323,6 +324,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +334,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -351,6 +351,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -533,7 +534,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14304,7 +21752,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -571,16 +572,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14316,9 +21764,121 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -588,8 +589,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -620,21 +621,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -651,7 +655,7 @@
+ test -z "$(linkdir)" || $(mkdir_p) "$(DESTDIR)$(linkdir)"
+ @list='$(link_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(linkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(linkdir)/$$f'"; \
+ $(linkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(linkdir)/$$f"; \
+ done
+@@ -659,7 +663,7 @@
+ uninstall-linkDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(link_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(linkdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(linkdir)/$$f"; \
+ done
+@@ -765,7 +769,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kabc/plugins/Makefile.in
+++ kabc/plugins/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -84,6 +84,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -125,8 +127,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -203,7 +203,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14328,7 +21888,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -295,6 +297,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,8 +307,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -323,6 +324,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -485,7 +487,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14337,7 +21922,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -523,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14349,9 +21934,192 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -545,13 +547,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -563,7 +559,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -571,13 +567,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -598,7 +588,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -697,17 +687,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -736,7 +724,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kabc/plugins/dir/Makefile.in
+++ kabc/plugins/dir/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -83,24 +78,34 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/resourcedir.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirconfig.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirplugin.Plo
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkabc_dir_la.all_cpp.P ./$(DEPDIR)/resourcedir.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirplugin.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/resourcedir.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcedirplugin.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
+ DIST_SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -124,6 +129,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -165,8 +172,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -243,7 +248,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -280,6 +284,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14361,7 +22129,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -547,7 +550,7 @@
+@@ -335,6 +342,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,8 +352,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -363,6 +369,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -547,7 +554,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14370,7 +22163,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +588,9 @@
+@@ -585,16 +592,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14382,9 +22175,222 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -602,8 +609,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -621,7 +628,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -629,8 +636,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -668,21 +675,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -699,7 +709,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -707,7 +717,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -716,7 +726,7 @@
+ test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
+ @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kabcincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kabcincludedir)/$$f'"; \
+ $(kabcincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kabcincludedir)/$$f"; \
+ done
+@@ -724,7 +734,7 @@
+ uninstall-kabcincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kabcincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kabcincludedir)/$$f"; \
+ done
+@@ -830,7 +840,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kabc/plugins/evolution/Makefile.in
+++ kabc/plugins/evolution/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kabc_evo_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ kabc_evo_la_DEPENDENCIES = ../../../kabc/libkabc.la \
+@@ -78,24 +73,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dbwrapper.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourceevo.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kabc_evo_la.all_cpp.P ./$(DEPDIR)/dbwrapper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceevo.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/dbwrapper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceevo.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kabc_evo_la_SOURCES)
+ DIST_SOURCES = $(kabc_evo_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -118,6 +120,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -159,8 +163,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -237,7 +239,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,6 +275,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14394,7 +22400,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -329,6 +333,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,8 +343,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -357,6 +360,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -530,7 +534,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14403,7 +22434,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -568,16 +572,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14415,9 +22446,187 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -585,8 +589,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -618,21 +622,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -649,7 +656,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -657,7 +664,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -763,7 +770,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kabc/plugins/file/Makefile.in
+++ kabc/plugins/file/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -83,24 +78,34 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/resourcefile.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileconfig.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileplugin.Plo
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkabc_file_la.all_cpp.P ./$(DEPDIR)/resourcefile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileplugin.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/resourcefile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcefileplugin.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
+ DIST_SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -124,6 +129,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -165,8 +172,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -243,7 +248,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -280,6 +284,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14427,7 +22636,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -548,7 +551,7 @@
+@@ -335,6 +342,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -344,8 +352,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -363,6 +369,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -548,7 +555,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14436,7 +22670,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +589,9 @@
+@@ -586,16 +593,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14448,9 +22682,225 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -603,8 +610,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -622,7 +629,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -630,8 +637,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -669,21 +676,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -700,7 +710,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -708,7 +718,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -717,7 +727,7 @@
+ test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
+ @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kabcincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kabcincludedir)/$$f'"; \
+ $(kabcincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kabcincludedir)/$$f"; \
+ done
+@@ -725,7 +735,7 @@
+ uninstall-kabcincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kabcincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kabcincludedir)/$$f"; \
+ done
+@@ -831,7 +841,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kabc/plugins/ldapkio/Makefile.in
+++ kabc/plugins/ldapkio/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kabc_ldapkio_la_SOURCES) $(libkabc_ldapkio_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -86,24 +81,34 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/resourceldapkio.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioconfig.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioplugin.Plo
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkabc_ldapkio_la.all_cpp.P ./$(DEPDIR)/resourceldapkio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioplugin.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/resourceldapkio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourceldapkioplugin.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kabc_ldapkio_la_SOURCES) $(libkabc_ldapkio_la_SOURCES)
+ DIST_SOURCES = $(kabc_ldapkio_la_SOURCES) \
+ $(libkabc_ldapkio_la_SOURCES)
+@@ -128,6 +133,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -169,8 +176,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -247,7 +252,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -284,6 +288,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14460,7 +22910,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -549,7 +552,7 @@
+@@ -339,6 +346,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -348,8 +356,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -367,6 +373,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -549,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14469,7 +22944,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +590,9 @@
+@@ -587,16 +594,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14481,9 +22956,225 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -604,8 +611,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -623,7 +630,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -631,8 +638,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -670,21 +677,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -701,7 +711,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -709,7 +719,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -718,7 +728,7 @@
+ test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
+ @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kabcincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kabcincludedir)/$$f'"; \
+ $(kabcincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kabcincludedir)/$$f"; \
+ done
+@@ -726,7 +736,7 @@
+ uninstall-kabcincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kabcincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kabcincludedir)/$$f"; \
+ done
+@@ -832,7 +842,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kabc/plugins/net/Makefile.in
+++ kabc/plugins/net/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(kabcincludedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -84,24 +79,34 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/resourcenet.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetconfig.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetplugin.Plo
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkabc_net_la.all_cpp.P ./$(DEPDIR)/resourcenet.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetplugin.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/resourcenet.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcenetplugin.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
+ DIST_SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -125,6 +130,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -166,8 +173,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -244,7 +249,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -281,6 +285,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14493,7 +23184,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -546,7 +549,7 @@
+@@ -336,6 +343,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -345,8 +353,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -364,6 +370,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -546,7 +553,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14502,7 +23218,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -584,9 +587,9 @@
+@@ -584,16 +591,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14514,9 +23230,219 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -601,8 +608,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -620,7 +627,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -628,8 +635,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -667,21 +674,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -698,7 +708,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -706,7 +716,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -715,7 +725,7 @@
+ test -z "$(kabcincludedir)" || $(mkdir_p) "$(DESTDIR)$(kabcincludedir)"
+ @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kabcincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kabcincludedir)/$$f'"; \
+ $(kabcincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kabcincludedir)/$$f"; \
+ done
+@@ -723,7 +733,7 @@
+ uninstall-kabcincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kabcinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kabcincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kabcincludedir)/$$f"; \
+ done
+@@ -829,7 +839,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kabc/plugins/sql/Makefile.in
+++ kabc/plugins/sql/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kabc_sql_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,12 +57,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(linkdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+@@ -75,24 +71,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/resourcesql.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resourcesqlconfig.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kabc_sql_la.all_cpp.P ./$(DEPDIR)/resourcesql.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcesqlconfig.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/resourcesql.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resourcesqlconfig.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kabc_sql_la_SOURCES)
+ DIST_SOURCES = $(kabc_sql_la_SOURCES)
+ linkDATA_INSTALL = $(INSTALL_DATA)
+@@ -115,6 +118,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -156,8 +161,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -234,7 +237,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -271,6 +273,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14526,7 +23452,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -326,6 +331,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +341,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -354,6 +358,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -528,7 +533,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14535,7 +23486,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -566,16 +571,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14547,9 +23498,121 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -583,8 +588,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -616,21 +621,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -647,7 +655,7 @@
+ test -z "$(linkdir)" || $(mkdir_p) "$(DESTDIR)$(linkdir)"
+ @list='$(link_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(linkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(linkdir)/$$f'"; \
+ $(linkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(linkdir)/$$f"; \
+ done
+@@ -655,7 +663,7 @@
+ uninstall-linkDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(link_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(linkdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(linkdir)/$$f"; \
+ done
+@@ -761,7 +769,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kabc/scripts/Makefile.in
+++ kabc/scripts/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -68,6 +68,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -109,8 +111,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -187,7 +187,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -224,6 +223,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14559,7 +23622,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -474,7 +477,7 @@
+@@ -279,6 +281,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -288,8 +291,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -307,6 +308,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -474,7 +476,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14568,7 +23656,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +515,9 @@
+@@ -512,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14580,9 +23668,117 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -584,7 +586,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kabc/tests/Makefile.in
+++ kabc/tests/Makefile.in
-@@ -342,6 +342,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(bigread_SOURCES) $(bigwrite_SOURCES) $(kabcargl_SOURCES) $(testaddressee_SOURCES) $(testaddresseelist_SOURCES) $(testaddressfmt_SOURCES) $(testaddresslineedit_SOURCES) $(testdb_SOURCES) $(testdistlist_SOURCES) $(testkabc_SOURCES) $(testkabcdlg_SOURCES) $(testldapclient_SOURCES) $(testlock_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -138,24 +140,45 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/bigread.Po ./$(DEPDIR)/bigwrite.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kabcargl.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testaddressee.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testaddresseelist.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testaddressfmt.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testaddresslineedit.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testdb.Po ./$(DEPDIR)/testdistlist.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testkabc.Po ./$(DEPDIR)/testkabcdlg.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testldapclient.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testlock.Po
++#>+ 10
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bigread.Po ./$(DEPDIR)/bigwrite.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kabcargl.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testaddressee.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testaddresseelist.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testaddressfmt.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testaddresslineedit.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testdb.Po ./$(DEPDIR)/testdistlist.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testkabc.Po ./$(DEPDIR)/testkabcdlg.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testldapclient.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testlock.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(bigread_SOURCES) $(bigwrite_SOURCES) $(kabcargl_SOURCES) \
+ $(testaddressee_SOURCES) $(testaddresseelist_SOURCES) \
+ $(testaddressfmt_SOURCES) $(testaddresslineedit_SOURCES) \
+@@ -186,6 +209,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -227,8 +252,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -305,7 +328,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -342,6 +364,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14592,7 +23788,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -624,7 +627,7 @@
+@@ -397,6 +422,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -406,8 +432,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -425,6 +449,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -624,7 +649,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14601,7 +23822,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +665,9 @@
+@@ -662,9 +687,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14613,8 +23834,141 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -737,21 +762,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -863,7 +891,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kabc/vcard/Makefile.in
+++ kabc/vcard/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) $(testwrite_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,12 +55,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -81,24 +77,29 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/testread.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testwrite.Po ./$(DEPDIR)/vCard-all.Plo
++#>+ 2
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/testread.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testwrite.Po ./$(DEPDIR)/vCard-all.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) \
+ $(testwrite_SOURCES)
+ DIST_SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) \
+@@ -120,6 +121,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -161,8 +164,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -239,7 +240,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
@@ -276,6 +276,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
@@ -14625,6 +23979,31 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
+@@ -331,6 +334,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -340,8 +344,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -359,6 +361,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
@@ -538,7 +541,7 @@
.SUFFIXES:
@@ -14634,7 +24013,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -576,16 +579,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14646,7 +24025,63 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -845,7 +848,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -593,8 +596,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -637,21 +640,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -766,7 +772,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -845,7 +851,7 @@
.NOEXPORT:
#>+ 2
@@ -14657,7 +24092,111 @@
docs-am:
--- kabc/vcardparser/Makefile.in
+++ kabc/vcardparser/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) $(testread2_SOURCES) $(testwrite_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -86,34 +88,44 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/testread.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testread2.Po ./$(DEPDIR)/testutils.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testwrite.Po ./$(DEPDIR)/vcard.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardline.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vcardparser.Plo
++#>+ 10
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libvcards_la.all_cpp.P $(DEPDIR)/testread2.all_cpp.P ./$(DEPDIR)/testread.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testread2.Po ./$(DEPDIR)/testutils.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testwrite.Po ./$(DEPDIR)/vcard.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardparser.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/testread.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testread2.Po ./$(DEPDIR)/testutils.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testwrite.Po ./$(DEPDIR)/vcard.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vcardparser.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) \
+ $(testread2_SOURCES) $(testwrite_SOURCES)
+ DIST_SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) \
+ $(testread2_SOURCES) $(testwrite_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(vcardsincludedir)"
+ vcardsincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(vcardsinclude_HEADERS)
+@@ -134,6 +146,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -175,8 +189,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -253,7 +265,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -290,6 +301,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14667,7 +24206,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,7 +553,7 @@
+@@ -345,6 +359,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -354,8 +369,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -373,6 +386,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -550,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14676,7 +24240,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,9 +591,9 @@
+@@ -588,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14688,9 +24252,102 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -638,21 +652,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -669,7 +686,7 @@
+ test -z "$(vcardsincludedir)" || $(mkdir_p) "$(DESTDIR)$(vcardsincludedir)"
+ @list='$(vcardsinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(vcardsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(vcardsincludedir)/$$f'"; \
+ $(vcardsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(vcardsincludedir)/$$f"; \
+ done
+@@ -677,7 +694,7 @@
+ uninstall-vcardsincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(vcardsinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(vcardsincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(vcardsincludedir)/$$f"; \
+ done
+@@ -785,7 +802,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kate/Makefile.in
+++ kate/Makefile.in
-@@ -242,6 +242,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -86,6 +86,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -127,8 +129,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -205,7 +205,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -242,6 +241,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14700,7 +24357,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -297,6 +299,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -306,8 +309,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -325,6 +326,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -489,7 +491,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14709,7 +24391,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14721,9 +24403,143 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -549,13 +551,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -567,7 +563,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -575,13 +571,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -602,7 +592,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -702,17 +692,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -741,7 +729,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kate/data/Makefile.in
+++ kate/data/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,15 +54,7 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_servicesdir)" \
+- "$(DESTDIR)$(partrcdir)" "$(DESTDIR)$(rckatedir)" \
+- "$(DESTDIR)$(syntaxkatedir)"
++am__installdirs = "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(partrcdir)" "$(DESTDIR)$(rckatedir)" "$(DESTDIR)$(syntaxkatedir)"
+ kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+ partrcDATA_INSTALL = $(INSTALL_DATA)
+ rckateDATA_INSTALL = $(INSTALL_DATA)
+@@ -84,6 +76,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -125,8 +119,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -203,7 +195,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -240,6 +231,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14733,7 +24549,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,7 @@
+@@ -295,6 +289,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,8 +299,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -323,6 +316,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -507,7 +501,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -14742,7 +24583,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +548,9 @@
+@@ -545,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14754,7 +24595,88 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -773,7 +776,7 @@
+@@ -564,7 +558,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -572,7 +566,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -581,7 +575,7 @@
+ test -z "$(partrcdir)" || $(mkdir_p) "$(DESTDIR)$(partrcdir)"
+ @list='$(partrc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(partrcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(partrcdir)/$$f'"; \
+ $(partrcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(partrcdir)/$$f"; \
+ done
+@@ -589,7 +583,7 @@
+ uninstall-partrcDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(partrc_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(partrcdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(partrcdir)/$$f"; \
+ done
+@@ -598,7 +592,7 @@
+ test -z "$(rckatedir)" || $(mkdir_p) "$(DESTDIR)$(rckatedir)"
+ @list='$(rckate_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(rckateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rckatedir)/$$f'"; \
+ $(rckateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rckatedir)/$$f"; \
+ done
+@@ -606,7 +600,7 @@
+ uninstall-rckateDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(rckate_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(rckatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(rckatedir)/$$f"; \
+ done
+@@ -615,7 +609,7 @@
+ test -z "$(syntaxkatedir)" || $(mkdir_p) "$(DESTDIR)$(syntaxkatedir)"
+ @list='$(syntaxkate_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(syntaxkateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(syntaxkatedir)/$$f'"; \
+ $(syntaxkateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(syntaxkatedir)/$$f"; \
+ done
+@@ -623,7 +617,7 @@
+ uninstall-syntaxkateDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(syntaxkate_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(syntaxkatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(syntaxkatedir)/$$f"; \
+ done
+@@ -687,7 +681,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -773,7 +767,7 @@
.NOEXPORT:
#>+ 2
@@ -14765,7 +24687,105 @@
docs-am:
--- kate/interfaces/Makefile.in
+++ kate/interfaces/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkatepartinterfaces_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kateincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -76,24 +72,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/interfaces.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katecmd.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkatepartinterfaces_la.all_cpp.P ./$(DEPDIR)/interfaces.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecmd.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/interfaces.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecmd.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkatepartinterfaces_la_SOURCES)
+ DIST_SOURCES = $(libkatepartinterfaces_la_SOURCES)
+ kateincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -115,6 +118,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -156,8 +161,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -234,7 +237,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -271,6 +273,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14775,7 +24795,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -326,6 +331,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +341,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -354,6 +358,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -526,7 +531,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14784,7 +24829,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -564,16 +569,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14796,9 +24841,274 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -581,8 +586,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -614,21 +619,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -645,7 +653,7 @@
+ test -z "$(kateincludedir)" || $(mkdir_p) "$(DESTDIR)$(kateincludedir)"
+ @list='$(kateinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kateincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kateincludedir)/$$f'"; \
+ $(kateincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kateincludedir)/$$f"; \
+ done
+@@ -653,7 +661,7 @@
+ uninstall-kateincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kateinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kateincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kateincludedir)/$$f"; \
+ done
+@@ -759,7 +767,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kate/part/Makefile.in
+++ kate/part/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(libkatepart_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -52,12 +54,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_moduledir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+@@ -96,24 +92,124 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/katearbitraryhighlight.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateattribute.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateautoindent.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katebookmarks.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katebuffer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katecmds.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katecodecompletion.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katecodefoldinghelpers.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateconfig.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katecursor.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katedialogs.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katedocument.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katedocumenthelpers.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katefactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katefiletype.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katefont.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katehighlight.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateindentscriptabstracts.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katejscript.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katelinerange.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateluaindentscript.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateprinter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katerenderer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateschema.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katesearch.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katespell.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katesupercursor.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katesyntaxdocument.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katetemplatehandler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/katetextline.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateundo.Plo ./$(DEPDIR)/kateview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateviewhelpers.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kateviewinternal.Plo
++#>+ 66
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/katedocument_skel.P $(DEPDIR)/libkatepart_la.all_cpp.P ./$(DEPDIR)/katearbitraryhighlight.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateattribute.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateautoindent.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katebookmarks.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katebuffer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecmds.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecodecompletion.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecodefoldinghelpers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecursor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedialogs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedocument.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedocumenthelpers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefiletype.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefont.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katehighlight.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateindentscriptabstracts.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katejscript.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katelinerange.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateluaindentscript.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateprinter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katerenderer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateschema.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesearch.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katespell.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesupercursor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesyntaxdocument.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katetemplatehandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/katetextline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateundo.Plo ./$(DEPDIR)/kateview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateviewhelpers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateviewinternal.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/katedocument_skel.P ./$(DEPDIR)/katearbitraryhighlight.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateattribute.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateautoindent.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katebookmarks.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katebuffer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecmds.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecodecompletion.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecodefoldinghelpers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katecursor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedialogs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedocument.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katedocumenthelpers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefiletype.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katefont.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katehighlight.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateindentscriptabstracts.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katejscript.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katelinerange.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateluaindentscript.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateprinter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katerenderer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateschema.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesearch.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katespell.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesupercursor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katesyntaxdocument.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katetemplatehandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/katetextline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateundo.Plo ./$(DEPDIR)/kateview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateviewhelpers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateviewinternal.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkatepart_la_SOURCES)
+ DIST_SOURCES = $(libkatepart_la_SOURCES)
+ ETAGS = etags
+@@ -133,6 +229,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -174,8 +272,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -252,7 +348,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -289,6 +384,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14808,7 +25118,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -344,6 +442,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -353,8 +452,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -372,6 +469,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -566,7 +664,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14817,7 +25152,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -604,16 +702,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14829,7 +25164,63 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -924,13 +927,6 @@
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -621,8 +719,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -686,21 +784,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -815,7 +916,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -924,13 +1025,6 @@
mocs: katecodecompletion.moc
#>+ 3
@@ -14843,7 +25234,7 @@
katedocument.moc: $(srcdir)/katedocument.h
$(MOC) $(srcdir)/katedocument.h -o katedocument.moc
-@@ -938,18 +934,18 @@
+@@ -938,18 +1032,18 @@
mocs: katedocument.moc
#>+ 3
@@ -14868,7 +25259,7 @@
#>+ 3
kateviewinternal.moc: $(srcdir)/kateviewinternal.h
-@@ -959,11 +955,11 @@
+@@ -959,11 +1053,11 @@
mocs: kateviewinternal.moc
#>+ 3
@@ -14883,7 +25274,7 @@
#>+ 3
katedocumenthelpers.moc: $(srcdir)/katedocumenthelpers.h
-@@ -973,6 +969,13 @@
+@@ -973,6 +1067,13 @@
mocs: katedocumenthelpers.moc
#>+ 3
@@ -14897,7 +25288,7 @@
kateviewhelpers.moc: $(srcdir)/kateviewhelpers.h
$(MOC) $(srcdir)/kateviewhelpers.h -o kateviewhelpers.moc
-@@ -1058,7 +1061,7 @@
+@@ -1058,7 +1159,7 @@
#>+ 3
clean-metasources:
@@ -14906,7 +25297,7 @@
#>+ 2
KDE_DIST=katetextline.h kateindentscriptabstracts.h kateviewhelpers.h kateschema.h kateview.h katespell.h katearbitraryhighlight.h kateviewinternal.h kateundo.h katedocument.h katecodefoldinghelpers.h katecodecompletion.h katekeyinterceptorfunctor.h katecmds.h katefactory.h Makefile.in katejscript.h kateautoindent.h katebuffer.h katedocumenthelpers.h katerenderer.h katehighlight.h kateconfig.h kateluaindentscript.h katesyntaxdocument.h katesearch.h kateprinter.h katecursor.h kateattribute.h katetemplatehandler.h katebookmarks.h katedialogs.h configure.in.in katefiletype.h katefont.h katelinerange.h Makefile.am katesupercursor.h
-@@ -1114,7 +1117,7 @@
+@@ -1114,7 +1215,7 @@
#>+ 11
@@ -14917,7 +25308,45 @@
echo "#define KDE_USE_FINAL 1" >> libkatepart_la.all_cpp.final; \
--- kate/plugins/Makefile.in
+++ kate/plugins/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -84,6 +84,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -125,8 +127,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -203,7 +203,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14927,7 +25356,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -295,6 +297,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,8 +307,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -323,6 +324,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -485,7 +487,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -14936,7 +25390,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -523,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14948,9 +25402,185 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -545,13 +547,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -563,7 +559,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -571,13 +567,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -598,7 +588,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -697,17 +687,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -736,7 +724,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kate/plugins/autobookmarker/Makefile.in
+++ kate/plugins/autobookmarker/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(confdir)" \
+- "$(DESTDIR)$(kde_servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(confdir)" "$(DESTDIR)$(kde_servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ ktexteditor_autobookmarker_la_DEPENDENCIES = \
+@@ -73,24 +68,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/autobookmarker.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autobookmarker.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
+ confDATA_INSTALL = $(INSTALL_DATA)
+@@ -113,6 +111,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -154,8 +154,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -232,7 +230,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -269,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14960,7 +25590,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -324,6 +324,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,8 +334,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -352,6 +351,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -525,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14969,7 +25624,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -563,16 +563,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14981,9 +25636,199 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -580,8 +580,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -612,21 +612,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -643,7 +646,7 @@
+ test -z "$(confdir)" || $(mkdir_p) "$(DESTDIR)$(confdir)"
+ @list='$(conf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
+ $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
+ done
+@@ -651,7 +654,7 @@
+ uninstall-confDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(conf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(confdir)/$$f"; \
+ done
+@@ -660,7 +663,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -668,7 +671,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -774,7 +777,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kate/plugins/insertfile/Makefile.in
+++ kate/plugins/insertfile/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(ktexteditor_insertfile_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,15 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(insertfiledatadir)" \
+- "$(DESTDIR)$(kde_servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(insertfiledatadir)" "$(DESTDIR)$(kde_servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ ktexteditor_insertfile_la_DEPENDENCIES = \
+@@ -74,24 +68,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/insertfileplugin.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/insertfileplugin.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_insertfile_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_insertfile_la_SOURCES)
+ insertfiledataDATA_INSTALL = $(INSTALL_DATA)
+@@ -114,6 +111,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -155,8 +154,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -233,7 +230,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -14993,7 +25838,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -325,6 +324,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +334,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -353,6 +351,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -526,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15002,7 +25872,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -564,16 +563,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15014,9 +25884,198 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -581,8 +580,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -613,21 +612,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -644,7 +646,7 @@
+ test -z "$(insertfiledatadir)" || $(mkdir_p) "$(DESTDIR)$(insertfiledatadir)"
+ @list='$(insertfiledata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(insertfiledataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(insertfiledatadir)/$$f'"; \
+ $(insertfiledataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(insertfiledatadir)/$$f"; \
+ done
+@@ -652,7 +654,7 @@
+ uninstall-insertfiledataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(insertfiledata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(insertfiledatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(insertfiledatadir)/$$f"; \
+ done
+@@ -661,7 +663,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -669,7 +671,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -775,7 +777,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kate/plugins/isearch/Makefile.in
+++ kate/plugins/isearch/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(ktexteditor_isearch_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(isearchdatadir)" "$(DESTDIR)$(kde_servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(isearchdatadir)" "$(DESTDIR)$(kde_servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ ktexteditor_isearch_la_DEPENDENCIES = \
+@@ -72,24 +67,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/ISearchPlugin.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ISearchPlugin.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_isearch_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_isearch_la_SOURCES)
+ isearchdataDATA_INSTALL = $(INSTALL_DATA)
+@@ -112,6 +110,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -153,8 +153,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -231,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15026,7 +26085,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -323,6 +323,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +333,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -351,6 +350,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -524,7 +524,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15035,7 +26119,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -562,16 +562,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15047,9 +26131,198 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -579,8 +579,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -611,21 +611,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -642,7 +645,7 @@
+ test -z "$(isearchdatadir)" || $(mkdir_p) "$(DESTDIR)$(isearchdatadir)"
+ @list='$(isearchdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(isearchdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(isearchdatadir)/$$f'"; \
+ $(isearchdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(isearchdatadir)/$$f"; \
+ done
+@@ -650,7 +653,7 @@
+ uninstall-isearchdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(isearchdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(isearchdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(isearchdatadir)/$$f"; \
+ done
+@@ -659,7 +662,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -667,7 +670,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -773,7 +776,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kate/plugins/kdatatool/Makefile.in
+++ kate/plugins/kdatatool/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kdatatooldatadir)" "$(DESTDIR)$(kde_servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdatatooldatadir)" "$(DESTDIR)$(kde_servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ ktexteditor_kdatatool_la_DEPENDENCIES = \
+@@ -73,24 +68,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kate_kdatatool.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kate_kdatatool.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
+ kdatatooldataDATA_INSTALL = $(INSTALL_DATA)
+@@ -113,6 +111,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -154,8 +154,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -232,7 +230,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -269,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15059,7 +26332,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -324,6 +324,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,8 +334,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -352,6 +351,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -525,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15068,7 +26366,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -563,16 +563,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15080,9 +26378,199 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -580,8 +580,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -612,21 +612,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -643,7 +646,7 @@
+ test -z "$(kdatatooldatadir)" || $(mkdir_p) "$(DESTDIR)$(kdatatooldatadir)"
+ @list='$(kdatatooldata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdatatooldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdatatooldatadir)/$$f'"; \
+ $(kdatatooldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdatatooldatadir)/$$f"; \
+ done
+@@ -651,7 +654,7 @@
+ uninstall-kdatatooldataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdatatooldata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdatatooldatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdatatooldatadir)/$$f"; \
+ done
+@@ -660,7 +663,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -668,7 +671,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -774,7 +777,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kate/plugins/wordcompletion/Makefile.in
+++ kate/plugins/wordcompletion/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,15 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(docwordcompletiondatadir)" \
+- "$(DESTDIR)$(kde_servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(docwordcompletiondatadir)" "$(DESTDIR)$(kde_servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ ktexteditor_docwordcompletion_la_DEPENDENCIES = \
+@@ -74,24 +68,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/docwordcompletion.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/docwordcompletion.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
+ docwordcompletiondataDATA_INSTALL = $(INSTALL_DATA)
+@@ -114,6 +111,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -155,8 +154,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -233,7 +230,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15092,7 +26580,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -325,6 +324,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +334,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -353,6 +351,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -526,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15101,7 +26614,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -564,16 +563,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15113,9 +26626,155 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -581,8 +580,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -613,21 +612,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -644,7 +646,7 @@
+ test -z "$(docwordcompletiondatadir)" || $(mkdir_p) "$(DESTDIR)$(docwordcompletiondatadir)"
+ @list='$(docwordcompletiondata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(docwordcompletiondataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docwordcompletiondatadir)/$$f'"; \
+ $(docwordcompletiondataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docwordcompletiondatadir)/$$f"; \
+ done
+@@ -652,7 +654,7 @@
+ uninstall-docwordcompletiondataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(docwordcompletiondata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(docwordcompletiondatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(docwordcompletiondatadir)/$$f"; \
+ done
+@@ -661,7 +663,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -669,7 +671,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -775,7 +777,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kate/scripts/Makefile.in
+++ kate/scripts/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,14 +54,7 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(indentscriptskatedir)" \
+- "$(DESTDIR)$(scriptskatedir)"
++am__installdirs = "$(DESTDIR)$(indentscriptskatedir)" "$(DESTDIR)$(scriptskatedir)"
+ indentscriptskateDATA_INSTALL = $(INSTALL_DATA)
+ scriptskateDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(indentscriptskate_DATA) $(scriptskate_DATA)
+@@ -80,6 +73,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -121,8 +116,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -199,7 +192,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -236,6 +228,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15125,7 +26784,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -484,7 +487,7 @@
+@@ -291,6 +286,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,8 +296,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -319,6 +313,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -484,7 +479,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15134,7 +26818,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -522,9 +525,9 @@
+@@ -522,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15146,9 +26830,151 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -541,7 +536,7 @@
+ test -z "$(indentscriptskatedir)" || $(mkdir_p) "$(DESTDIR)$(indentscriptskatedir)"
+ @list='$(indentscriptskate_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(indentscriptskateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(indentscriptskatedir)/$$f'"; \
+ $(indentscriptskateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(indentscriptskatedir)/$$f"; \
+ done
+@@ -549,7 +544,7 @@
+ uninstall-indentscriptskateDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(indentscriptskate_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(indentscriptskatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(indentscriptskatedir)/$$f"; \
+ done
+@@ -558,7 +553,7 @@
+ test -z "$(scriptskatedir)" || $(mkdir_p) "$(DESTDIR)$(scriptskatedir)"
+ @list='$(scriptskate_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(scriptskateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(scriptskatedir)/$$f'"; \
+ $(scriptskateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(scriptskatedir)/$$f"; \
+ done
+@@ -566,7 +561,7 @@
+ uninstall-scriptskateDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(scriptskate_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(scriptskatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(scriptskatedir)/$$f"; \
+ done
+@@ -630,7 +625,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kcert/Makefile.in
+++ kcert/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkcertpart_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(rcdir)" \
+- "$(DESTDIR)$(servicedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(servicedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -71,24 +66,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcertpart.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kcertpart.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkcertpart_la_SOURCES)
+ DIST_SOURCES = $(libkcertpart_la_SOURCES)
+ rcDATA_INSTALL = $(INSTALL_DATA)
+@@ -111,6 +109,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -152,8 +152,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -230,7 +228,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -267,6 +264,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15158,7 +26984,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -322,6 +322,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -331,8 +332,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -350,6 +349,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -523,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -15167,7 +27018,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -561,16 +561,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15179,9 +27030,205 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -578,8 +578,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -610,21 +610,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -641,7 +644,7 @@
+ test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+ @list='$(rc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
+ $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
+ done
+@@ -649,7 +652,7 @@
+ uninstall-rcDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(rc_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(rcdir)/$$f"; \
+ done
+@@ -658,7 +661,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -666,7 +669,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -772,7 +775,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kcmshell/Makefile.in
+++ kcmshell/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,6 +37,10 @@
+
+
+
++#>- SOURCES = $(kcmshell_la_SOURCES)
++#>+ 1
++SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -76,14 +80,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)"
++am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -104,27 +101,29 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Plo
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kcmshell.la.Po $(DEPDIR)/kcmshell_dummy.Plo $(DEPDIR)/main_skel.P $(DEPDIR)/libkdeinit_kcmshell_la.all_cpp.P ./$(DEPDIR)/main.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kcmshell.la.Po $(DEPDIR)/kcmshell_dummy.Plo $(DEPDIR)/main_skel.P ./$(DEPDIR)/main.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(kcmshell_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES)
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kcmshell_la_SOURCES)
+ #>- DIST_SOURCES = $(kcmshell_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES)
+@@ -146,6 +145,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -187,8 +188,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -265,7 +264,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -302,6 +300,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15191,7 +27238,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -357,6 +358,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -366,8 +368,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -385,6 +385,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -562,7 +563,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15200,7 +27272,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -600,16 +601,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15212,9 +27284,188 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -617,8 +618,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -636,7 +637,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -644,8 +645,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -701,21 +702,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -832,7 +836,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kconf_update/Makefile.in
+++ kconf_update/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,6 +34,10 @@
+ # Boston, MA 02110-1301, USA.
+
+
++#>- SOURCES = $(kconf_update_la_SOURCES)
++#>+ 1
++SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -72,14 +76,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)"
++am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -101,27 +98,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kconf_update.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kconf_update.la.Po $(DEPDIR)/kconf_update_dummy.Plo ./$(DEPDIR)/kconf_update.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(kconf_update_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES)
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kconf_update_la_SOURCES)
+ #>- DIST_SOURCES = $(kconf_update_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES)
+@@ -142,6 +140,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -183,8 +183,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -261,7 +259,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -298,6 +295,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15224,7 +27475,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -353,6 +353,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -362,8 +363,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -381,6 +380,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -554,7 +554,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15233,7 +27509,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,16 +592,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15245,9 +27521,123 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -609,8 +609,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -628,7 +628,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -636,8 +636,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -693,21 +693,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -823,7 +826,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdecore/Makefile.in
+++ kdecore/Makefile.in
-@@ -104,6 +104,12 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -41,6 +41,8 @@
+
+
+
++SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c $(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) $(kde_config_SOURCES) $(kgrantpty_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -81,15 +83,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES = kde-config.cpp
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(colorsdir)" \
+- "$(DESTDIR)$(kdebugdir)" "$(DESTDIR)$(includedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(colorsdir)" "$(DESTDIR)$(kdebugdir)" "$(DESTDIR)$(includedir)"
+ libLIBRARIES_INSTALL = $(INSTALL_DATA)
+ LIBRARIES = $(lib_LIBRARIES)
+ ARFLAGS = cru
+@@ -104,6 +98,12 @@
vsnprintf_nonpic.$(OBJEXT)
@KDE_USE_FINAL_FALSE at libkdefakes_nonpic_a_OBJECTS = $(libkdefakes_nonpic_a_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at libkdefakes_nonpic_a_OBJECTS = $(libkdefakes_nonpic_a_final_OBJECTS)
@@ -15260,14 +27650,331 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
@include_SVGICONS_TRUE at am__DEPENDENCIES_1 = \
-@@ -231,10 +237,10 @@
+@@ -205,36 +205,319 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I. -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/fakes.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/fakes_nonpic.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdata.Plo ./$(DEPDIR)/kaccel.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccelaction.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccelbase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccelmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kallocator.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kappdcopiface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kapplication.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kasyncio.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplayer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbufferedio.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystem.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemgregorian.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhebrew.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhijri.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemjalali.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcatalogue.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcharsets.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcheckaccelerators.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kckey.Plo ./$(DEPDIR)/kclipboard.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargs.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcompletion.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfig.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbackend.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialogmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigskeleton.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcrash.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdcoppropertyproxy.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kde-config.Po ./$(DEPDIR)/kdebug.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdebugdcopiface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdesktopfile.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdeversion.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kextsock.Plo ./$(DEPDIR)/kglobal.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel_x11.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kglobalsettings.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kgrantpty-kgrantpty.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconeffect.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconloader.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kicontheme.Plo ./$(DEPDIR)/kidna.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kinstance.Plo ./$(DEPDIR)/kipc.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kkeynative_x11.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kkeyserver_x11.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klibloader.Plo ./$(DEPDIR)/klocale.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klockfile.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpander.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmanagerselection.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodec.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimesourcefactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmountpoint.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmultipledrag.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotifyclient.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpalette.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapprovider.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprocctrl.Plo ./$(DEPDIR)/kprocess.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprocio.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo_kdecore.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfofactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpty.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kqiodevicegzip_p.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequence.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kregexp.Plo ./$(DEPDIR)/krfcdate.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krootprop.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksavefile.Plo ./$(DEPDIR)/kshell.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshortcut.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutlist.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutmenu.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfig.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksock.Plo ./$(DEPDIR)/ksockaddr.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocks.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstandarddirs.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstartupinfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstaticdeleter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstdaccel.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksycoca.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksycocadict.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksycocafactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktempdir.Plo ./$(DEPDIR)/ktempfile.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktimezones.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapplication.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurl.Plo ./$(DEPDIR)/kurldrag.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuser.Plo ./$(DEPDIR)/kvmallocator.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwin.Plo ./$(DEPDIR)/kwinmodule.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmessages.Plo ./$(DEPDIR)/libintl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkdefakes_pic.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/netsupp.Plo ./$(DEPDIR)/netwm.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf_nonpic.Po
++#>+ 188
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/ksycoca_skel.P $(DEPDIR)/kappdcopiface_skel.P $(DEPDIR)/kdebugdcopiface_skel.P $(DEPDIR)/libkdecore_la.all_cpp.P ./$(DEPDIR)/fakes.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fakes_nonpic.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdata.Plo ./$(DEPDIR)/kaccel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kallocator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kappdcopiface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kapplication.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kasyncio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplayer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbufferedio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystem.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemgregorian.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhebrew.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhijri.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemjalali.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcatalogue.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharsets.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcheckaccelerators.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kckey.Plo ./$(DEPDIR)/kclipboard.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletion.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbackend.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialogmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigskeleton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcrash.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcoppropertyproxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kde-config.Po ./$(DEPDIR)/kdebug.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdebugdcopiface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesktopfile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeversion.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kextsock.Plo ./$(DEPDIR)/kglobal.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel_x11.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalsettings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kgrantpty-kgrantpty.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconeffect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconloader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicontheme.Plo ./$(DEPDIR)/kidna.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinstance.Plo ./$(DEPDIR)/kipc.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeynative_x11.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeyserver_x11.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klibloader.Plo ./$(DEPDIR)/klocale.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klockfile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpander.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmanagerselection.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodec.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimesourcefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmountpoint.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmultipledrag.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifyclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpalette.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapprovider.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocctrl.Plo ./$(DEPDIR)/kprocess.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo_kdecore.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfofactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpty.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kqiodevicegzip_p.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequence.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kregexp.Plo ./$(DEPDIR)/krfcdate.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krootprop.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksavefile.Plo ./$(DEPDIR)/kshell.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcut.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutlist.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksock.Plo ./$(DEPDIR)/ksockaddr.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocks.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstandarddirs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstartupinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstaticdeleter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdaccel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycoca.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocadict.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocafactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktempdir.Plo ./$(DEPDIR)/ktempfile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezones.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapplication.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurl.Plo ./$(DEPDIR)/kurldrag.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuser.Plo ./$(DEPDIR)/kvmallocator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwin.Plo ./$(DEPDIR)/kwinmodule.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmessages.Plo ./$(DEPDIR)/libintl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdefakes_pic.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/netsupp.Plo ./$(DEPDIR)/netwm.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf_nonpic.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/ksycoca_skel.P $(DEPDIR)/kappdcopiface_skel.P $(DEPDIR)/kdebugdcopiface_skel.P ./$(DEPDIR)/fakes.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fakes_nonpic.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdata.Plo ./$(DEPDIR)/kaccel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kallocator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kappdcopiface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kapplication.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kasyncio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaudioplayer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbufferedio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystem.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemgregorian.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhebrew.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemhijri.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendarsystemjalali.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcatalogue.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharsets.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcheckaccelerators.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kckey.Plo ./$(DEPDIR)/kclipboard.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletion.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbackend.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialogmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigskeleton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcrash.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcoppropertyproxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kde-config.Po ./$(DEPDIR)/kdebug.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdebugdcopiface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesktopfile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeversion.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kextsock.Plo ./$(DEPDIR)/kglobal.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalaccel_x11.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobalsettings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kgrantpty-kgrantpty.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconeffect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconloader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicontheme.Plo ./$(DEPDIR)/kidna.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinstance.Plo ./$(DEPDIR)/kipc.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeynative_x11.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeyserver_x11.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klibloader.Plo ./$(DEPDIR)/klocale.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klockfile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpander.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmanagerselection.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodec.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimesourcefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmountpoint.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmultipledrag.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifyclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpalette.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapprovider.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocctrl.Plo ./$(DEPDIR)/kprocess.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo_kdecore.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfofactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpty.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kqiodevicegzip_p.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequence.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kregexp.Plo ./$(DEPDIR)/krfcdate.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krootprop.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksavefile.Plo ./$(DEPDIR)/kshell.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcut.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutlist.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksock.Plo ./$(DEPDIR)/ksockaddr.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocks.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstandarddirs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstartupinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstaticdeleter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdaccel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycoca.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocadict.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocafactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktempdir.Plo ./$(DEPDIR)/ktempfile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezones.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapplication.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurl.Plo ./$(DEPDIR)/kurldrag.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuser.Plo ./$(DEPDIR)/kvmallocator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwin.Plo ./$(DEPDIR)/kwinmodule.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmessages.Plo ./$(DEPDIR)/libintl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkdefakes_pic.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/netsupp.Plo ./$(DEPDIR)/netwm.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vsnprintf_nonpic.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libkdefakes_nonpic_a_SOURCES) $(libkdecore_la_SOURCES) \
- $(libkdefakes_la_SOURCES) $(kde_config_SOURCES) \
- $(kgrantpty_SOURCES)
-DIST_SOURCES = $(libkdefakes_nonpic_a_SOURCES) \
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libkdefakes_nonpic_a_SOURCES) libkdefakes_pic.c \
+ $(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) \
+ $(kde_config_SOURCES) $(kgrantpty_SOURCES)
@@ -15275,7 +27982,33 @@
$(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) \
$(kde_config_SOURCES) $(kgrantpty_SOURCES)
#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -429,6 +435,9 @@
+@@ -273,6 +556,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -314,8 +599,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -392,7 +675,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -429,6 +711,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15285,7 +28018,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -677,7 +686,7 @@
+@@ -484,6 +769,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -493,8 +779,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -512,6 +796,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -677,7 +962,7 @@
# into $(all_libraries) isn't better
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
lib_LTLIBRARIES = libkdefakes.la libkdecore.la
@@ -15294,7 +28052,7 @@
include_HEADERS = kconfig.h kconfigskeleton.h \
kconfigdata.h ksimpleconfig.h kconfigdialogmanager.h \
kconfigbase.h kdesktopfile.h kurl.h ksock.h kaboutdata.h \
-@@ -818,7 +827,7 @@
+@@ -818,7 +1103,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -15303,7 +28061,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -856,9 +865,9 @@
+@@ -856,9 +1141,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15315,16 +28073,65 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
kdemacros.h: stamp-h3
-@@ -870,7 +879,7 @@
+@@ -870,10 +1155,6 @@
stamp-h3: $(srcdir)/kdemacros.h.in $(top_builddir)/config.status
@rm -f stamp-h3
cd $(top_builddir) && $(SHELL) ./config.status kdecore/kdemacros.h
-$(srcdir)/kdemacros.h.in: $(am__configure_deps)
-+$(srcdir)/kdemacros.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h3
- touch $@
-@@ -1096,6 +1105,7 @@
+- cd $(top_srcdir) && $(AUTOHEADER)
+- rm -f stamp-h3
+- touch $@
+
+ distclean-hdr:
+ -rm -f kdemacros.h stamp-h3
+@@ -884,7 +1165,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -892,7 +1173,7 @@
+ @$(POST_INSTALL)
+ @list='$(lib_LIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- p=$(am__strip_dir) \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
+ $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
+ else :; fi; \
+@@ -901,7 +1182,7 @@
+ uninstall-libLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(lib_LIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -917,7 +1198,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -925,8 +1206,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -1096,6 +1377,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kxerrorhandler.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kxmessages.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libintl.Plo at am__quote@
@@ -15332,7 +28139,240 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netsupp.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netwm.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vsnprintf.Plo at am__quote@
-@@ -1524,6 +1534,12 @@
+@@ -1105,56 +1387,72 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ kgrantpty-kgrantpty.o: kgrantpty.c
+ @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.o -MD -MP -MF "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" -c -o kgrantpty-kgrantpty.o `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" "$(DEPDIR)/kgrantpty-kgrantpty.Po"; else rm -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kgrantpty.c' object='kgrantpty-kgrantpty.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kgrantpty-kgrantpty.Po' tmpdepfile='$(DEPDIR)/kgrantpty-kgrantpty.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -c -o kgrantpty-kgrantpty.o `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c
+
+ kgrantpty-kgrantpty.obj: kgrantpty.c
+ @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.obj -MD -MP -MF "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" -c -o kgrantpty-kgrantpty.obj `if test -f 'kgrantpty.c'; then $(CYGPATH_W) 'kgrantpty.c'; else $(CYGPATH_W) '$(srcdir)/kgrantpty.c'; fi`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" "$(DEPDIR)/kgrantpty-kgrantpty.Po"; else rm -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kgrantpty.c' object='kgrantpty-kgrantpty.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kgrantpty-kgrantpty.Po' tmpdepfile='$(DEPDIR)/kgrantpty-kgrantpty.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -c -o kgrantpty-kgrantpty.obj `if test -f 'kgrantpty.c'; then $(CYGPATH_W) 'kgrantpty.c'; else $(CYGPATH_W) '$(srcdir)/kgrantpty.c'; fi`
+
++kgrantpty-kgrantpty.lo: kgrantpty.c
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -MT kgrantpty-kgrantpty.lo -MD -MP -MF "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" -c -o kgrantpty-kgrantpty.lo `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo" "$(DEPDIR)/kgrantpty-kgrantpty.Plo"; else rm -f "$(DEPDIR)/kgrantpty-kgrantpty.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kgrantpty.c' object='kgrantpty-kgrantpty.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kgrantpty-kgrantpty.Plo' tmpdepfile='$(DEPDIR)/kgrantpty-kgrantpty.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kgrantpty_CFLAGS) $(CFLAGS) -c -o kgrantpty-kgrantpty.lo `test -f 'kgrantpty.c' || echo '$(srcdir)/'`kgrantpty.c
++
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -1171,7 +1469,7 @@
+ test -z "$(colorsdir)" || $(mkdir_p) "$(DESTDIR)$(colorsdir)"
+ @list='$(colors_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(colorsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(colorsdir)/$$f'"; \
+ $(colorsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(colorsdir)/$$f"; \
+ done
+@@ -1179,7 +1477,7 @@
+ uninstall-colorsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(colors_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(colorsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(colorsdir)/$$f"; \
+ done
+@@ -1188,7 +1486,7 @@
+ test -z "$(kdebugdir)" || $(mkdir_p) "$(DESTDIR)$(kdebugdir)"
+ @list='$(kdebug_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdebugDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdebugdir)/$$f'"; \
+ $(kdebugDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdebugdir)/$$f"; \
+ done
+@@ -1196,7 +1494,7 @@
+ uninstall-kdebugDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdebug_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdebugdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdebugdir)/$$f"; \
+ done
+@@ -1205,7 +1503,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -1213,7 +1511,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -1225,13 +1523,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1243,7 +1535,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -1251,13 +1543,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -1278,7 +1564,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1381,14 +1667,12 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1423,7 +1707,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+ maintainer-clean-generic:
+@@ -1502,14 +1786,14 @@
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-binPROGRAMS install-colorsDATA \
+ install-data install-data-am install-data-local install-exec \
+- install-exec-am install-exec-hook install-includeHEADERS \
+- install-info install-info-am install-kdebugDATA \
+- install-libLIBRARIES install-libLTLIBRARIES install-man \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++ install-exec-am install-includeHEADERS install-info \
++ install-info-am install-kdebugDATA install-libLIBRARIES \
++ install-libLTLIBRARIES install-man install-strip installcheck \
++ installcheck-am installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic maintainer-clean-recursive \
++ mostlyclean mostlyclean-compile mostlyclean-generic \
++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-colorsDATA \
+ uninstall-includeHEADERS uninstall-info-am \
+ uninstall-kdebugDATA uninstall-libLIBRARIES \
+@@ -1524,6 +1808,12 @@
-rm -f vsnprintf_nonpic.c
$(LN_S) $(srcdir)/vsnprintf.c vsnprintf_nonpic.c
@@ -15345,7 +28385,7 @@
.PHONY: kckey_h parser
kckey_h : $(srcdir)/generate_keys.sh $(QNAMESPACE_H)
(cd $(srcdir) && ./generate_keys.sh $(QNAMESPACE_H))
-@@ -1835,18 +1851,18 @@
+@@ -1835,18 +2125,18 @@
mocs: ksock.moc
#>+ 3
@@ -15370,7 +28410,7 @@
#>+ 3
kuniqueapplication.moc: $(srcdir)/kuniqueapplication.h
-@@ -1884,18 +1900,18 @@
+@@ -1884,18 +2174,18 @@
mocs: klibloader.moc
#>+ 3
@@ -15395,7 +28435,7 @@
#>+ 3
kaccelprivate.moc: $(srcdir)/kaccelprivate.h
-@@ -1913,7 +1929,7 @@
+@@ -1913,7 +2203,7 @@
#>+ 3
clean-metasources:
@@ -15404,7 +28444,7 @@
#>+ 2
KDE_DIST=README.kiosk standard_weak.nmcheck libkdecore_weak.nmcheck Makefile.in README.exec kglobalaccel_mac.h netsupp_win32.cpp libkdecore.nmcheck kappdcopiface.h DESIGN.iconloading kglobalaccel_win.cpp README.user_profiles Web.colors kglobalaccel_emb.h DESIGN.kconfig MAINTAINERS README.kstartupinfo configure.in.in kdemacros.h.in libqt-mt.nmcheck kde_dmalloc.h Rainbow.colors kdebugrc 40.colors kdebug.areas kdebugdcopiface.h Royal.colors kapplication_win.cpp language.codes libqt-mt_weak.nmcheck kaccelmanager_private.h Makefile.am kde-config.cpp.in
-@@ -1971,7 +1987,7 @@
+@@ -1971,7 +2261,7 @@
#>+ 11
@@ -15415,7 +28455,98 @@
echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
--- kdecore/kconfig_compiler/Makefile.in
+++ kdecore/kconfig_compiler/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(autoexample_SOURCES) $(example_SOURCES) $(kconfig_compiler_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -85,24 +87,37 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/autoexample.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/example.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/exampleprefs_base.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfig_compiler.Po
++#>+ 8
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/general_base.P $(DEPDIR)/myoptions_base.P $(DEPDIR)/autoexample.all_cpp.P $(DEPDIR)/example.all_cpp.P ./$(DEPDIR)/autoexample.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/example.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exampleprefs_base.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfig_compiler.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/general_base.P $(DEPDIR)/myoptions_base.P ./$(DEPDIR)/autoexample.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/example.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/exampleprefs_base.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfig_compiler.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(autoexample_SOURCES) $(example_SOURCES) \
+ $(kconfig_compiler_SOURCES)
+ DIST_SOURCES = $(autoexample_SOURCES) $(example_SOURCES) \
+@@ -138,6 +153,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -179,8 +196,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -257,7 +272,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -294,6 +308,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15425,7 +28556,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -349,6 +366,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -358,8 +376,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -377,6 +393,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -558,7 +575,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15434,7 +28590,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15446,9 +28602,234 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -660,21 +677,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -694,13 +714,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -712,7 +726,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -720,13 +734,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -747,7 +755,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -846,17 +854,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -891,7 +897,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdecore/kconfig_compiler/tests/Makefile.in
+++ kdecore/kconfig_compiler/tests/Makefile.in
-@@ -350,6 +350,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(kunittest_kconfigcompiler_test_la_SOURCES) $(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) $(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) $(test7_SOURCES) $(test8_SOURCES) $(test9_SOURCES) $(test_dpointer_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -149,24 +151,64 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kconfigcompiler_test.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test1.Po ./$(DEPDIR)/test1main.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test2.Po ./$(DEPDIR)/test2main.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test3.Po ./$(DEPDIR)/test3main.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test4.Po ./$(DEPDIR)/test4main.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test5.Po ./$(DEPDIR)/test5main.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test6.Po ./$(DEPDIR)/test6main.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test7.Po ./$(DEPDIR)/test7main.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test8a.Po ./$(DEPDIR)/test8b.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test8main.Po ./$(DEPDIR)/test9.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test9main.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer_main.Po
++#>+ 26
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/test1.all_cpp.P $(DEPDIR)/test2.all_cpp.P $(DEPDIR)/test3.all_cpp.P $(DEPDIR)/test4.all_cpp.P $(DEPDIR)/test5.all_cpp.P $(DEPDIR)/test6.all_cpp.P $(DEPDIR)/test7.all_cpp.P $(DEPDIR)/test8.all_cpp.P $(DEPDIR)/test9.all_cpp.P $(DEPDIR)/test_dpointer.all_cpp.P ./$(DEPDIR)/kconfigcompiler_test.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test1.Po ./$(DEPDIR)/test1main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test2.Po ./$(DEPDIR)/test2main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test3.Po ./$(DEPDIR)/test3main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test4.Po ./$(DEPDIR)/test4main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test5.Po ./$(DEPDIR)/test5main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test6.Po ./$(DEPDIR)/test6main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test7.Po ./$(DEPDIR)/test7main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test8a.Po ./$(DEPDIR)/test8b.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test8main.Po ./$(DEPDIR)/test9.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test9main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer_main.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kconfigcompiler_test.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test1.Po ./$(DEPDIR)/test1main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test2.Po ./$(DEPDIR)/test2main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test3.Po ./$(DEPDIR)/test3main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test4.Po ./$(DEPDIR)/test4main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test5.Po ./$(DEPDIR)/test5main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test6.Po ./$(DEPDIR)/test6main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test7.Po ./$(DEPDIR)/test7main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test8a.Po ./$(DEPDIR)/test8b.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test8main.Po ./$(DEPDIR)/test9.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test9main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_dpointer_main.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kunittest_kconfigcompiler_test_la_SOURCES) \
+ $(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) \
+ $(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) \
+@@ -194,6 +236,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -235,8 +279,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -313,7 +355,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -350,6 +391,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15458,7 +28839,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -642,7 +645,7 @@
+@@ -405,6 +449,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -414,8 +459,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -433,6 +476,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -642,7 +686,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15467,7 +28873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -680,9 +683,9 @@
+@@ -680,9 +724,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15479,7 +28885,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
-@@ -1040,7 +1043,7 @@
+@@ -766,21 +810,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -893,7 +940,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1040,7 +1087,7 @@
.NOEXPORT:
#>+ 2
@@ -15490,7 +28933,73 @@
docs-am:
--- kdecore/malloc/Makefile.in
+++ kdecore/malloc/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,6 +37,8 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ # Boston, MA 02110-1301, USA.
+
++SOURCES = $(libklmalloc_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -83,13 +85,16 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/malloc.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/malloc.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libklmalloc_la_SOURCES)
+ DIST_SOURCES = $(libklmalloc_la_SOURCES)
+@@ -110,6 +115,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -151,8 +158,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -229,7 +234,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -266,6 +270,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15500,7 +29009,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -321,6 +328,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -330,8 +338,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -349,6 +355,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -516,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -15509,7 +29043,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -554,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15521,9 +29055,184 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -582,21 +589,24 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -707,7 +717,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdecore/network/Makefile.in
+++ kdecore/network/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(libkdecorenetwork_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -79,32 +81,78 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kbufferedsocket.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kclientsocketbase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatagramsocket.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khttpproxysocketdevice.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kresolver.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kresolvermanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kresolverstandardworkers.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kresolverworkerbase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kreverseresolver.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kserversocket.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocketaddress.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbuffer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocketdevice.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksockssocketdevice.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksrvresolverworker.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstreamsocket.Plo
++#>+ 34
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkdecorenetwork_la.all_cpp.P ./$(DEPDIR)/kbufferedsocket.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kclientsocketbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatagramsocket.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khttpproxysocketdevice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolvermanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolverstandardworkers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolverworkerbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreverseresolver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kserversocket.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketaddress.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbuffer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketdevice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksockssocketdevice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksrvresolverworker.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstreamsocket.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kbufferedsocket.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kclientsocketbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatagramsocket.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khttpproxysocketdevice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolvermanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolverstandardworkers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolverworkerbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreverseresolver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kserversocket.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketaddress.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketbuffer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocketdevice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksockssocketdevice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksrvresolverworker.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstreamsocket.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkdecorenetwork_la_SOURCES)
+ DIST_SOURCES = $(libkdecorenetwork_la_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(configdir)" "$(DESTDIR)$(includedir)"
+ configDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(config_DATA)
+@@ -127,6 +175,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -168,8 +218,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -246,7 +294,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -283,6 +330,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15533,7 +29242,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -338,6 +388,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -347,8 +398,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -366,6 +415,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -587,7 +637,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15542,7 +29276,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +675,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15554,7 +29288,80 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -919,32 +922,32 @@
+@@ -669,21 +719,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -700,7 +753,7 @@
+ test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
+ $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
+ done
+@@ -708,7 +761,7 @@
+ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(configdir)/$$f"; \
+ done
+@@ -717,7 +770,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -725,7 +778,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -831,7 +884,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -919,32 +972,32 @@
mocs: ksrvresolverworker_p.moc
#>+ 3
@@ -15599,7 +29406,7 @@
#>+ 3
kresolver.moc: $(srcdir)/kresolver.h
-@@ -969,7 +972,7 @@
+@@ -969,7 +1022,7 @@
#>+ 3
clean-metasources:
@@ -15608,7 +29415,7 @@
#>+ 2
KDE_DIST=Makefile.in ipv6blacklist Makefile.am
-@@ -1057,8 +1060,8 @@
+@@ -1057,8 +1110,8 @@
ksrvresolverworker.o: ksrvresolverworker_p.moc
kbufferedsocket.o: kbufferedsocket.moc
kbufferedsocket.lo: kbufferedsocket.moc
@@ -15620,7 +29427,100 @@
kstreamsocket.lo: kstreamsocket.moc
--- kdecore/svgicons/Makefile.in
+++ kdecore/svgicons/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkdesvgicons_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -66,32 +68,33 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/ksvgiconengine.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksvgiconpainter.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkdesvgicons_la.all_cpp.P ./$(DEPDIR)/ksvgiconengine.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksvgiconpainter.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/ksvgiconengine.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksvgiconpainter.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkdesvgicons_la_SOURCES)
+ DIST_SOURCES = $(libkdesvgicons_la_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(includedir)"
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS)
+@@ -112,6 +115,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -153,8 +158,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -231,7 +234,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,6 +270,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15630,7 +29530,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -323,6 +328,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +338,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -351,6 +355,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -517,7 +522,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15639,7 +29564,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +560,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15651,9 +29576,251 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -584,21 +589,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -615,7 +623,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -623,7 +631,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -729,7 +737,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdecore/tests/Makefile.in
+++ kdecore/tests/Makefile.in
-@@ -558,6 +558,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,6 +34,8 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ # Boston, MA 02110-1301, USA.
+
++SOURCES = $(kunittest_kconfig_la_SOURCES) $(cplusplustest_SOURCES) $(dcopkonqtest_SOURCES) $(kapptest_SOURCES) $(kcalendartest_SOURCES) $(kcharsetstest_SOURCES) $(kcmdlineargstest_SOURCES) $(kconfigtestgui_SOURCES) $(kdebugtest_SOURCES) $(kglobaltest_SOURCES) $(kiconloadertest_SOURCES) $(kidlclienttest_SOURCES) $(kidlservertest_SOURCES) $(kipctest_SOURCES) $(klocaletest_SOURCES) $(kmacroexpandertest_SOURCES) $(kmdcodectest_SOURCES) $(kmemtest_SOURCES) $(knotifytest_SOURCES) $(kprocesstest_SOURCES) $(kprociotest_SOURCES) $(krandomsequencetest_SOURCES) $(kresolvertest_SOURCES) $(krfcdatetest_SOURCES) $(kshelltest_SOURCES) $(ksimpleconfigtest_SOURCES) $(ksocktest_SOURCES) $(ksortablevaluelisttest_SOURCES) $(kstdacceltest_SOURCES) $(kstddirstest_SOURCES) $(kstringhandlertest_SOURCES) $(ktempfiletest_SOURCES) $(ktimezonestest_SOURCES) $(kuniqueapptest_SOURCES) $(kurltest_SOURCES) $(kxerrorhandlertest_SOURCES) $(startserviceby_SOURCES) $(testqtargs_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -327,24 +329,133 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/KIDLTest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/KIDLTestClient.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cplusplustest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopkonqtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kapptest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcalendartest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcharsetstest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargstest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtest.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtestgui.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdebugtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kglobaltest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconloadertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kipctest.Po ./$(DEPDIR)/klocaletest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpandertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodectest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmemtest.Po ./$(DEPDIR)/knotifytest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprocesstest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprociotest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequencetest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kresolvertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krfcdatetest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshelltest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfigtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksocktest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksortablevaluelisttest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstdacceltest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstddirstest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandlertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktempfiletest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonestest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapptest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurltest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandlertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/startserviceby.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testqtargs.Po
++#>+ 72
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/KIDLTest_stub.P $(DEPDIR)/KIDLTest_skel.P $(DEPDIR)/kidlclienttest.all_cpp.P $(DEPDIR)/kidlservertest.all_cpp.P ./$(DEPDIR)/KIDLTest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/KIDLTestClient.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cplusplustest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopkonqtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kapptest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendartest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharsetstest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargstest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtest.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtestgui.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdebugtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobaltest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconloadertest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kipctest.Po ./$(DEPDIR)/klocaletest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpandertest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodectest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmemtest.Po ./$(DEPDIR)/knotifytest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocesstest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprociotest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequencetest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolvertest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krfcdatetest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshelltest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfigtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocktest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksortablevaluelisttest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdacceltest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstddirstest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandlertest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktempfiletest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonestest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapptest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurltest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandlertest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/startserviceby.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testqtargs.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/KIDLTest_stub.P $(DEPDIR)/KIDLTest_skel.P ./$(DEPDIR)/KIDLTest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/KIDLTestClient.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cplusplustest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopkonqtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kapptest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcalendartest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharsetstest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmdlineargstest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtest.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigtestgui.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdebugtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kglobaltest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconloadertest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kipctest.Po ./$(DEPDIR)/klocaletest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmacroexpandertest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdcodectest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmemtest.Po ./$(DEPDIR)/knotifytest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprocesstest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprociotest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krandomsequencetest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kresolvertest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krfcdatetest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshelltest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksimpleconfigtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksocktest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksortablevaluelisttest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdacceltest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstddirstest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringhandlertest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktempfiletest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonestest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuniqueapptest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurltest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxerrorhandlertest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/startserviceby.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testqtargs.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kunittest_kconfig_la_SOURCES) $(cplusplustest_SOURCES) \
+ $(dcopkonqtest_SOURCES) $(kapptest_SOURCES) \
+ $(kcalendartest_SOURCES) $(kcharsetstest_SOURCES) \
+@@ -402,6 +513,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -443,8 +556,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -521,7 +632,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -558,6 +668,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15663,7 +29830,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -858,7 +861,7 @@
+@@ -613,6 +726,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -622,8 +736,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -641,6 +753,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -858,7 +971,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15672,7 +29864,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -896,9 +899,9 @@
+@@ -896,9 +1009,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15684,7 +29876,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
-@@ -1360,18 +1363,18 @@
+@@ -1079,21 +1192,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -1279,7 +1395,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1360,18 +1476,18 @@
.NOEXPORT:
#>+ 3
@@ -15709,7 +29938,7 @@
#>+ 3
kprociotest.moc: $(srcdir)/kprociotest.h
-@@ -1406,7 +1409,7 @@
+@@ -1406,7 +1522,7 @@
#>+ 3
clean-metasources:
@@ -15720,7 +29949,145 @@
KDE_DIST=Makefile.in kconfigtestgui.h Makefile.am
--- kded/Makefile.in
+++ kded/Makefile.in
-@@ -337,6 +337,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,6 +37,10 @@
+
+
+
++#>- SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
++#>+ 1
++SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -77,16 +81,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(servicetypedir)" \
+- "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_menudir)" \
+- "$(DESTDIR)$(includedir)"
++am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(xdg_menudir)" "$(DESTDIR)$(includedir)"
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -130,29 +125,60 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kbuildimageiofactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kde-menu.Po ./$(DEPDIR)/kded.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khostname.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/vfolder_menu.Plo
++#>+ 22
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kded.la.Po $(DEPDIR)/kded_dummy.Plo $(DEPDIR)/kbuildsycoca.la.Po $(DEPDIR)/kbuildsycoca_dummy.Plo $(DEPDIR)/libkdeinit_kded_la.all_cpp.P $(DEPDIR)/libkdeinit_kbuildsycoca_la.all_cpp.P $(DEPDIR)/kbuildsycoca_la.all_cpp.P $(DEPDIR)/kded_la.all_cpp.P ./$(DEPDIR)/kbuildimageiofactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kde-menu.Po ./$(DEPDIR)/kded.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khostname.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/vfolder_menu.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kded.la.Po $(DEPDIR)/kded_dummy.Plo $(DEPDIR)/kbuildsycoca.la.Po $(DEPDIR)/kbuildsycoca_dummy.Plo ./$(DEPDIR)/kbuildimageiofactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kde-menu.Po ./$(DEPDIR)/kded.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khostname.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/vfolder_menu.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
+-#>- $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
+- $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES)
++ $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
+ #>- DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
+ #>- $(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
+ #>+ 2
+@@ -181,6 +207,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -222,8 +250,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -300,7 +326,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -337,6 +362,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15730,7 +30097,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -392,6 +420,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -401,8 +430,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -420,6 +447,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -622,7 +650,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15739,7 +30131,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -660,16 +688,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15751,7 +30143,155 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1216,18 +1219,18 @@
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -677,8 +705,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -696,7 +724,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -704,8 +732,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -780,21 +808,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -811,7 +842,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -819,7 +850,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -828,7 +859,7 @@
+ test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+ @list='$(update_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
+ $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+@@ -836,7 +867,7 @@
+ uninstall-updateDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(update_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+@@ -845,7 +876,7 @@
+ test -z "$(xdg_menudir)" || $(mkdir_p) "$(DESTDIR)$(xdg_menudir)"
+ @list='$(xdg_menu_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(xdg_menuDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdg_menudir)/$$f'"; \
+ $(xdg_menuDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdg_menudir)/$$f"; \
+ done
+@@ -853,7 +884,7 @@
+ uninstall-xdg_menuDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(xdg_menu_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(xdg_menudir)/$$f'"; \
+ rm -f "$(DESTDIR)$(xdg_menudir)/$$f"; \
+ done
+@@ -862,7 +893,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -870,7 +901,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -979,7 +1010,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1216,18 +1247,18 @@
kbuildsycoca_DEPENDENCIES = libkdeinit_kbuildsycoca.la
#>+ 3
@@ -15776,7 +30316,7 @@
#>+ 3
kdedmodule.moc: $(srcdir)/kdedmodule.h
-@@ -1245,7 +1248,7 @@
+@@ -1245,7 +1276,7 @@
#>+ 3
clean-metasources:
@@ -15787,7 +30327,105 @@
KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am
--- kded/test/Makefile.in
+++ kded/test/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,8 @@
+ # $Id: Makefile.am 334039 2004-07-30 03:27:07Z nhasan $
+
+
++SOURCES = $(kded_test_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -77,24 +72,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/test.Plo
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/test_skel.P $(DEPDIR)/kded_test_la.all_cpp.P ./$(DEPDIR)/test.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/test_skel.P ./$(DEPDIR)/test.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_test_la_SOURCES)
+ DIST_SOURCES = $(kded_test_la_SOURCES)
+ servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -116,6 +115,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -157,8 +158,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -235,7 +234,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -272,6 +270,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15797,7 +30435,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -327,6 +328,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,8 +338,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -355,6 +355,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -529,7 +530,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15806,7 +30469,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -567,16 +568,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15818,9 +30481,196 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -584,8 +585,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -613,21 +614,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -644,7 +648,7 @@
+ test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+ @list='$(services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
+ $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -652,7 +656,7 @@
+ uninstall-servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -758,7 +762,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdefx/Makefile.in
+++ kdefx/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,6 +37,8 @@
+ #SUBDIRS = . tests
+
+
++SOURCES = $(libkdefx_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -75,12 +77,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -100,24 +96,46 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcpuinfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdrawutil.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kimageeffect.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmap.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapeffect.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapsplitter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstyle.Plo
++#>+ 14
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkdefx_la.all_cpp.P ./$(DEPDIR)/kcpuinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdrawutil.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimageeffect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmap.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapeffect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapsplitter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstyle.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kcpuinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdrawutil.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimageeffect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmap.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapeffect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapsplitter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstyle.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkdefx_la_SOURCES)
+ DIST_SOURCES = $(libkdefx_la_SOURCES)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -139,6 +157,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -180,8 +200,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -258,7 +276,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -295,6 +312,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15830,7 +30680,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -350,6 +370,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -359,8 +380,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -378,6 +397,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -560,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15839,7 +30714,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,16 +618,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15851,9 +30726,291 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -615,8 +635,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -656,21 +676,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -687,7 +710,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -695,7 +718,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -802,7 +825,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeprint/Makefile.in
+++ kdeprint/Makefile.in
-@@ -349,6 +349,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,8 @@
+
+
+
++SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) $(libkdeprint_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -65,17 +67,7 @@
+ #>- libdriverparse_a_OBJECTS = $(am_libdriverparse_a_OBJECTS)
+ #>+ 1
+ libdriverparse_a_OBJECTS = driverparse.$(OBJEXT)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(configdir)" "$(DESTDIR)$(printdatadir)" \
+- "$(DESTDIR)$(servicesdir)" "$(DESTDIR)$(uidatadir)" \
+- "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(includedir)" \
+- "$(DESTDIR)$(kdeprintdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(printdatadir)" "$(DESTDIR)$(servicesdir)" "$(DESTDIR)$(uidatadir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(kdeprintdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -121,32 +113,133 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/driver.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/driveritem.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/driverparse.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/driverview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/droptionview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/foomatic2loader.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/fooparser.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/fooscanner.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdeprintcheck.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdeprintd.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilelist.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdbentry.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmfactory.Plo ./$(DEPDIR)/kmjob.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmjobmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmprinter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmspecialmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmthreadjob.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmuimanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmvirtualmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpcopiespage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpdriverpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpfileselectpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpfilterpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpgeneralpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpipeprocess.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpmarginpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpposterpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpqtpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpreloadobject.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprintaction.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprintdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprintdialogpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprinter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprinterimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprinterpropertydialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprintpreview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprintprocess.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommand.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/marginpreview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/marginvaluewidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/marginwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/messagewindow.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugincombobox.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/posterpreview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ppdloader.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ppdparser.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ppdscanner.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/printerfilter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/treecombobox.Plo ./$(DEPDIR)/util.Plo
++#>+ 50
++ at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kdeprintd_skel.P $(DEPDIR)/kmfactory_skel.P ./$(DEPDIR)/driver.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/driveritem.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/driverparse.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/driverview.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/droptionview.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/foomatic2loader.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fooparser.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fooscanner.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeprintcheck.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeprintd.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilelist.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdbentry.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfactory.Plo ./$(DEPDIR)/kmjob.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmjobmanager.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmmanager.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmprinter.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmspecialmanager.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmthreadjob.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmuimanager.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmvirtualmanager.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpcopiespage.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpdriverpage.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpfileselectpage.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpfilterpage.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpgeneralpage.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpipeprocess.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpmarginpage.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpposterpage.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpqtpage.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreloadobject.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprintaction.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprintdialog.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprintdialogpage.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprinter.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprinterimpl.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprinterpropertydialog.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprintpreview.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprintprocess.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommand.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/marginpreview.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/marginvaluewidget.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/marginwidget.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/messagewindow.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugincombobox.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/posterpreview.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ppdloader.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ppdparser.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ppdscanner.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printerfilter.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/treecombobox.Plo ./$(DEPDIR)/util.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) \
+ $(libkdeprint_la_SOURCES)
+ DIST_SOURCES = $(libdriverparse_a_SOURCES) \
+@@ -193,6 +286,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -234,8 +329,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -312,7 +405,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -349,6 +441,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -15863,7 +31020,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -677,7 +680,7 @@
+@@ -404,6 +499,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -413,8 +509,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -432,6 +526,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -677,7 +772,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -15872,7 +31054,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -715,9 +718,9 @@
+@@ -715,9 +810,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15884,9 +31066,305 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-@@ -1471,13 +1474,6 @@
+@@ -731,7 +826,7 @@
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -739,8 +834,8 @@
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -758,7 +853,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -766,8 +861,8 @@
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -851,42 +946,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -903,7 +1004,7 @@
+ test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)"
+ @list='$(config_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \
+ $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \
+ done
+@@ -911,7 +1012,7 @@
+ uninstall-configDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(config_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(configdir)/$$f"; \
+ done
+@@ -920,7 +1021,7 @@
+ test -z "$(printdatadir)" || $(mkdir_p) "$(DESTDIR)$(printdatadir)"
+ @list='$(printdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(printdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(printdatadir)/$$f'"; \
+ $(printdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(printdatadir)/$$f"; \
+ done
+@@ -928,7 +1029,7 @@
+ uninstall-printdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(printdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(printdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(printdatadir)/$$f"; \
+ done
+@@ -937,7 +1038,7 @@
+ test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+ @list='$(services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
+ $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -945,7 +1046,7 @@
+ uninstall-servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -954,7 +1055,7 @@
+ test -z "$(uidatadir)" || $(mkdir_p) "$(DESTDIR)$(uidatadir)"
+ @list='$(uidata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(uidataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidatadir)/$$f'"; \
+ $(uidataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidatadir)/$$f"; \
+ done
+@@ -962,7 +1063,7 @@
+ uninstall-uidataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(uidata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(uidatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(uidatadir)/$$f"; \
+ done
+@@ -971,7 +1072,7 @@
+ test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+ @list='$(update_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
+ $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+@@ -979,7 +1080,7 @@
+ uninstall-updateDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(update_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+@@ -988,7 +1089,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -996,7 +1097,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -1005,7 +1106,7 @@
+ test -z "$(kdeprintdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintdir)"
+ @list='$(kdeprint_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdeprintHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeprintdir)/$$f'"; \
+ $(kdeprintHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeprintdir)/$$f"; \
+ done
+@@ -1013,7 +1114,7 @@
+ uninstall-kdeprintHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdeprint_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdeprintdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdeprintdir)/$$f"; \
+ done
+@@ -1025,13 +1126,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1043,7 +1138,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -1051,13 +1146,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -1078,7 +1167,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1181,14 +1270,12 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1220,7 +1307,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1471,13 +1558,6 @@
+
+
#>+ 3
-kprintdialog.moc: $(srcdir)/kprintdialog.h
- $(MOC) $(srcdir)/kprintdialog.h -o kprintdialog.moc
@@ -15898,7 +31376,7 @@
posterpreview.moc: $(srcdir)/posterpreview.h
$(MOC) $(srcdir)/posterpreview.h -o posterpreview.moc
-@@ -1485,11 +1481,11 @@
+@@ -1485,11 +1565,11 @@
mocs: posterpreview.moc
#>+ 3
@@ -15913,7 +31391,7 @@
#>+ 3
marginpreview.moc: $(srcdir)/marginpreview.h
-@@ -1499,6 +1495,13 @@
+@@ -1499,6 +1579,13 @@
mocs: marginpreview.moc
#>+ 3
@@ -15927,7 +31405,7 @@
kmjobmanager.moc: $(srcdir)/kmjobmanager.h
$(MOC) $(srcdir)/kmjobmanager.h -o kmjobmanager.moc
-@@ -1527,11 +1530,11 @@
+@@ -1527,11 +1614,11 @@
mocs: plugincombobox.moc
#>+ 3
@@ -15942,7 +31420,7 @@
#>+ 3
kpgeneralpage.moc: $(srcdir)/kpgeneralpage.h
-@@ -1541,11 +1544,11 @@
+@@ -1541,11 +1628,11 @@
mocs: kpgeneralpage.moc
#>+ 3
@@ -15957,7 +31435,7 @@
#>+ 3
kpfilterpage.moc: $(srcdir)/kpfilterpage.h
-@@ -1555,18 +1558,18 @@
+@@ -1555,18 +1642,18 @@
mocs: kpfilterpage.moc
#>+ 3
@@ -15982,7 +31460,7 @@
#>+ 3
kprintprocess.moc: $(srcdir)/kprintprocess.h
-@@ -1583,18 +1586,18 @@
+@@ -1583,18 +1670,18 @@
mocs: kfilelist.moc
#>+ 3
@@ -16007,7 +31485,7 @@
#>+ 3
kprinterimpl.moc: $(srcdir)/kprinterimpl.h
-@@ -1632,18 +1635,18 @@
+@@ -1632,18 +1719,18 @@
mocs: kmuimanager.moc
#>+ 3
@@ -16032,7 +31510,7 @@
#>+ 3
kprintaction.moc: $(srcdir)/kprintaction.h
-@@ -1654,7 +1657,7 @@
+@@ -1654,7 +1741,7 @@
#>+ 3
clean-metasources:
@@ -16043,7 +31521,202 @@
KDE_DIST=ppdparser.y testprint.ps kdeprintrc.upd Makefile.in specials.desktop fooparser.cpp.h kdeprintrc configure.in.in kdeprintd.desktop signal_proc.c ppdscanner.l ppdparser.cpp.h Makefile.am
--- kdeprint/cups/Makefile.in
+++ kdeprint/cups/Makefile.in
-@@ -334,6 +334,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,8 @@
+
+
+
++SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) $(make_driver_db_cups_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,14 +59,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -113,32 +108,123 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/cupsaddsmb2.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdoprint.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsinfos.Plo ./$(DEPDIR)/image.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/imageposition.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/imagepreview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ippreportdlg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ipprequest.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcupsprinterimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcups.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcupsdir.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsconfigwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsjobmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsuimanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbanners.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropquota.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropusers.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwbanners.Plo ./$(DEPDIR)/kmwfax.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwipp.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwippprinter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwippselect.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwother.Plo ./$(DEPDIR)/kmwquota.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwusers.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kphpgl2page.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpimagepage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpschedulepage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kptagspage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kptextpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_cups.Po
++#>+ 60
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_cups_la.all_cpp.P ./$(DEPDIR)/cupsaddsmb2.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdoprint.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsinfos.Plo ./$(DEPDIR)/image.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageposition.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagepreview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ippreportdlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ipprequest.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcupsprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcups.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcupsdir.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsconfigwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsjobmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsuimanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbanners.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropquota.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropusers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwbanners.Plo ./$(DEPDIR)/kmwfax.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwipp.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwippprinter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwippselect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwother.Plo ./$(DEPDIR)/kmwquota.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwusers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kphpgl2page.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpimagepage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpschedulepage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kptagspage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kptextpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_cups.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/cupsaddsmb2.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdoprint.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsinfos.Plo ./$(DEPDIR)/image.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imageposition.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/imagepreview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ippreportdlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ipprequest.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcupsprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcups.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcupsdir.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsconfigwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsjobmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmcupsuimanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbanners.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropquota.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropusers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwbanners.Plo ./$(DEPDIR)/kmwfax.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwipp.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwippprinter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwippselect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwother.Plo ./$(DEPDIR)/kmwquota.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwusers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kphpgl2page.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpimagepage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpschedulepage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kptagspage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kptextpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_cups.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) \
+ $(make_driver_db_cups_SOURCES)
+ DIST_SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) \
+@@ -178,6 +264,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -219,8 +307,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -297,7 +383,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -334,6 +419,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16053,7 +31726,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -389,6 +477,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -398,8 +487,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -417,6 +504,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -615,7 +703,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -16062,7 +31760,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +656,9 @@
+@@ -653,16 +741,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16074,7 +31772,196 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1180,18 +1183,18 @@
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -670,8 +758,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -768,42 +856,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -820,7 +914,7 @@
+ test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+ @list='$(entry_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
+ $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -828,7 +922,7 @@
+ uninstall-entryDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(entry_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
+ rm -f "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -837,7 +931,7 @@
+ test -z "$(miscdir)" || $(mkdir_p) "$(DESTDIR)$(miscdir)"
+ @list='$(misc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(miscDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(miscdir)/$$f'"; \
+ $(miscDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(miscdir)/$$f"; \
+ done
+@@ -845,7 +939,7 @@
+ uninstall-miscDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(misc_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(miscdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(miscdir)/$$f"; \
+ done
+@@ -857,13 +951,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -875,7 +963,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -883,13 +971,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -910,7 +992,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1009,17 +1091,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1051,7 +1131,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1180,18 +1260,18 @@
mocs: kpimagepage.moc
#>+ 3
@@ -16099,7 +31986,7 @@
#>+ 3
kmwippprinter.moc: $(srcdir)/kmwippprinter.h
-@@ -1237,7 +1240,7 @@
+@@ -1237,7 +1317,7 @@
#>+ 3
clean-metasources:
@@ -16108,7 +31995,7 @@
#>+ 2
KDE_DIST=cups.print Makefile.in preview-mini.png configure.in.in preview.png Makefile.am
-@@ -1288,7 +1291,7 @@
+@@ -1288,7 +1368,7 @@
#>+ 11
@@ -16119,7 +32006,184 @@
echo "#define KDE_USE_FINAL 1" >> kdeprint_cups_la.all_cpp.final; \
--- kdeprint/cups/cupsdconf2/Makefile.in
+++ kdeprint/cups/cupsdconf2/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -20,6 +20,10 @@
+
+
+
++#>- SOURCES = $(cupsdconf_la_SOURCES)
++#>+ 1
++SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -59,14 +63,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsdconfdatadir)"
++am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cupsdconfdatadir)"
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -96,35 +93,100 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/addressdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/browsedialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cups-util.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdbrowsingpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdcomment.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdconf.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsddialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsddirpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdfilterpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdjobspage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdlogpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdnetworkpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsecuritypage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdserverpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsplash.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/editlist.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/locationdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/portdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/qdirlineedit.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/qdirmultilineedit.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/sizewidget.Plo
++#>+ 44
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/cupsdconf.la.Po $(DEPDIR)/cupsdconf_dummy.Plo $(DEPDIR)/libkdeinit_cupsdconf_la.all_cpp.P $(DEPDIR)/cupsdconf_la.all_cpp.P ./$(DEPDIR)/addressdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/browsedialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cups-util.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdbrowsingpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdcomment.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdconf.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsddialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsddirpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdfilterpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdjobspage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdlogpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdnetworkpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsecuritypage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdserverpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsplash.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editlist.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/locationdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/portdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/qdirlineedit.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/qdirmultilineedit.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sizewidget.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/cupsdconf.la.Po $(DEPDIR)/cupsdconf_dummy.Plo ./$(DEPDIR)/addressdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/browsedialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cups-util.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdbrowsingpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdcomment.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdconf.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsddialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsddirpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdfilterpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdjobspage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdlogpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdnetworkpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsecuritypage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdserverpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cupsdsplash.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editlist.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/locationdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/portdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/qdirlineedit.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/qdirmultilineedit.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sizewidget.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(cupsdconf_la_SOURCES)
+-#>+ 1
+-SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES)
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(cupsdconf_la_SOURCES)
+ #>- DIST_SOURCES = $(cupsdconf_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES)
+@@ -148,6 +210,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -189,8 +253,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -267,7 +329,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -304,6 +365,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16129,7 +32193,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -359,6 +423,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -368,8 +433,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -387,6 +450,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -581,7 +645,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -16138,7 +32227,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,16 +683,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16150,7 +32239,128 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1104,22 +1107,22 @@
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -636,8 +700,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -655,7 +719,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -663,8 +727,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -742,42 +806,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -794,7 +864,7 @@
+ test -z "$(cupsdconfdatadir)" || $(mkdir_p) "$(DESTDIR)$(cupsdconfdatadir)"
+ @list='$(cupsdconfdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(cupsdconfdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cupsdconfdatadir)/$$f'"; \
+ $(cupsdconfdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cupsdconfdatadir)/$$f"; \
+ done
+@@ -802,7 +872,7 @@
+ uninstall-cupsdconfdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(cupsdconfdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(cupsdconfdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(cupsdconfdatadir)/$$f"; \
+ done
+@@ -910,7 +980,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1104,22 +1174,22 @@
mocs: cupsdnetworkpage.moc
#>+ 3
@@ -16180,7 +32390,7 @@
#>+ 2
KDE_DIST=kde_logo.png Makefile.in cupsd.conf.template cupsdcomment.pl cups_logo.png Makefile.am
-@@ -1166,7 +1169,7 @@
+@@ -1166,7 +1236,7 @@
#>+ 11
@@ -16189,7 +32399,7 @@
@echo 'creating libkdeinit_cupsdconf_la.all_cpp.cpp ...'; \
rm -f libkdeinit_cupsdconf_la.all_cpp.files libkdeinit_cupsdconf_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_cupsdconf_la.all_cpp.final; \
-@@ -1178,7 +1181,7 @@
+@@ -1178,7 +1248,7 @@
rm -f libkdeinit_cupsdconf_la.all_cpp.final libkdeinit_cupsdconf_la.all_cpp.files
#>+ 11
@@ -16200,7 +32410,111 @@
echo "#define KDE_USE_FINAL 1" >> cupsdconf_la.all_cpp.final; \
--- kdeprint/ext/Makefile.in
+++ kdeprint/ext/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kdeprint_ext_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,12 +57,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+@@ -78,24 +74,37 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kextprinterimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmextfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmextmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmextuimanager.Plo
++#>+ 8
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_ext_la.all_cpp.P ./$(DEPDIR)/kextprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextuimanager.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kextprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmextuimanager.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_ext_la_SOURCES)
+ DIST_SOURCES = $(kdeprint_ext_la_SOURCES)
+ entryDATA_INSTALL = $(INSTALL_DATA)
+@@ -118,6 +127,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -159,8 +170,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -237,7 +246,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,6 +282,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16210,7 +32524,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -329,6 +340,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,8 +350,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -357,6 +367,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -531,7 +542,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16219,7 +32558,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -569,16 +580,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16231,9 +32570,134 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -586,8 +597,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -621,21 +632,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -652,7 +666,7 @@
+ test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+ @list='$(entry_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
+ $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -660,7 +674,7 @@
+ uninstall-entryDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(entry_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
+ rm -f "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -766,7 +780,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeprint/filters/Makefile.in
+++ kdeprint/filters/Makefile.in
-@@ -237,6 +237,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -58,12 +58,6 @@
+ SCRIPTS = $(bin_SCRIPTS)
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ filtersDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(filters_DATA)
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -81,6 +75,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -122,8 +118,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -200,7 +194,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -237,6 +230,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16243,7 +32707,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,7 +497,7 @@
+@@ -292,6 +288,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -301,8 +298,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -320,6 +315,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -494,7 +490,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16252,7 +32741,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -532,9 +535,9 @@
+@@ -532,9 +528,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16264,9 +32753,153 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
+@@ -570,7 +566,7 @@
+ test -z "$(filtersdir)" || $(mkdir_p) "$(DESTDIR)$(filtersdir)"
+ @list='$(filters_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(filtersDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(filtersdir)/$$f'"; \
+ $(filtersDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(filtersdir)/$$f"; \
+ done
+@@ -578,7 +574,7 @@
+ uninstall-filtersDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(filters_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(filtersdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(filtersdir)/$$f"; \
+ done
+@@ -642,7 +638,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeprint/foomatic/Makefile.in
+++ kdeprint/foomatic/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,8 @@
+
+
+
++SOURCES = $(kdeprint_foomatic_la_SOURCES) $(make_driver_db_foomatic_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,14 +59,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(entrydir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ kdeprint_foomatic_la_DEPENDENCIES = \
+@@ -90,32 +85,45 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kfoomaticprinterimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_foomatic.Po
++#>+ 8
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_foomatic_la.all_cpp.P ./$(DEPDIR)/kfoomaticprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_foomatic.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kfoomaticprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfoomaticmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_foomatic.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_foomatic_la_SOURCES) \
+ $(make_driver_db_foomatic_SOURCES)
+ DIST_SOURCES = $(kdeprint_foomatic_la_SOURCES) \
+@@ -140,6 +148,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -181,8 +191,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -259,7 +267,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -296,6 +303,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16276,7 +32909,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -558,7 +561,7 @@
+@@ -351,6 +361,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,8 +371,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -379,6 +388,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -558,7 +568,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -16285,7 +32943,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +599,9 @@
+@@ -596,16 +606,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16297,9 +32955,236 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -613,8 +623,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -679,42 +689,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -731,7 +747,7 @@
+ test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+ @list='$(entry_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
+ $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -739,7 +755,7 @@
+ uninstall-entryDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(entry_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
+ rm -f "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -845,7 +861,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeprint/lpd/Makefile.in
+++ kdeprint/lpd/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,8 @@
+
+
+
++SOURCES = $(kdeprint_lpd_la_SOURCES) $(make_driver_db_lpd_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,14 +59,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(entrydir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ kdeprint_lpd_la_DEPENDENCIES = \
+@@ -89,32 +84,54 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/gschecker.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klpdprinterimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpduimanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/lpdtools.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpd.Po
++#>+ 14
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_lpd_la.all_cpp.P ./$(DEPDIR)/gschecker.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klpdprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpduimanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpdtools.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpd.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/gschecker.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klpdprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpduimanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpdtools.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpd.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_lpd_la_SOURCES) $(make_driver_db_lpd_SOURCES)
+ DIST_SOURCES = $(kdeprint_lpd_la_SOURCES) \
+ $(make_driver_db_lpd_SOURCES)
+@@ -138,6 +155,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -179,8 +198,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -257,7 +274,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -294,6 +310,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16309,7 +33194,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -349,6 +368,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -358,8 +378,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -377,6 +395,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -554,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -16318,7 +33228,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,16 +611,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16330,9 +33240,214 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -609,8 +628,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -678,42 +697,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -730,7 +755,7 @@
+ test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+ @list='$(entry_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
+ $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -738,7 +763,7 @@
+ uninstall-entryDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(entry_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
+ rm -f "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -844,7 +869,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeprint/lpdunix/Makefile.in
+++ kdeprint/lpdunix/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kdeprint_lpdunix_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,12 +57,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+@@ -80,24 +76,37 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/klpdunixprinterimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixuimanager.Plo
++#>+ 8
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_lpdunix_la.all_cpp.P ./$(DEPDIR)/klpdunixprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixuimanager.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/klpdunixprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpdunixuimanager.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_lpdunix_la_SOURCES)
+ DIST_SOURCES = $(kdeprint_lpdunix_la_SOURCES)
+ entryDATA_INSTALL = $(INSTALL_DATA)
+@@ -120,6 +129,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -161,8 +172,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -239,7 +248,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -276,6 +284,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16342,7 +33457,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -331,6 +342,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -340,8 +352,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -359,6 +369,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -533,7 +544,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16351,7 +33491,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -571,16 +582,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16363,9 +33503,243 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -588,8 +599,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -623,21 +634,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -654,7 +668,7 @@
+ test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+ @list='$(entry_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
+ $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -662,7 +676,7 @@
+ uninstall-entryDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(entry_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
+ rm -f "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -768,7 +782,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeprint/lpr/Makefile.in
+++ kdeprint/lpr/Makefile.in
-@@ -308,6 +308,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,8 @@
+
+
+
++SOURCES = $(kdeprint_lpr_la_SOURCES) $(make_driver_db_lpr_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,15 +59,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdatadir)" \
+- "$(DESTDIR)$(kdeprintlprdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(entrydir)" "$(DESTDIR)$(miscdatadir)" "$(DESTDIR)$(kdeprintlprdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ kdeprint_lpr_la_DEPENDENCIES = \
+@@ -101,32 +95,87 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/apshandler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/editentrydialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klprfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klprprinterimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiglpr.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlprjobmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlprmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlpruimanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/lpchelper.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/lpqhelper.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/lprhandler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/lprngtoolhandler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/lprsettings.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpr.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/matichandler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/matichelper.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/printcapentry.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/printcapreader.Plo
++#>+ 36
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_lpr_la.all_cpp.P ./$(DEPDIR)/apshandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/editentrydialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klprfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klprprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiglpr.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlprjobmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlprmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpruimanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpchelper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpqhelper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprngtoolhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprsettings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpr.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/matichandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/matichelper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printcapentry.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/printcapreader.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/apshandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/editentrydialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klprfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klprprinterimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiglpr.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlprjobmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlprmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlpruimanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpchelper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lpqhelper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprngtoolhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lprsettings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/make_driver_db_lpr.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/matichandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/matichelper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printcapentry.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/printcapreader.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_lpr_la_SOURCES) $(make_driver_db_lpr_SOURCES)
+ DIST_SOURCES = $(kdeprint_lpr_la_SOURCES) \
+ $(make_driver_db_lpr_SOURCES)
+@@ -152,6 +201,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -193,8 +244,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -271,7 +320,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -308,6 +356,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16375,7 +33749,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -363,6 +414,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -372,8 +424,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -391,6 +441,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -587,7 +638,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -16384,7 +33783,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,16 +676,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16396,9 +33795,406 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -642,8 +693,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -722,42 +773,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -774,7 +831,7 @@
+ test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+ @list='$(entry_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
+ $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -782,7 +839,7 @@
+ uninstall-entryDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(entry_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
+ rm -f "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -791,7 +848,7 @@
+ test -z "$(miscdatadir)" || $(mkdir_p) "$(DESTDIR)$(miscdatadir)"
+ @list='$(miscdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(miscdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(miscdatadir)/$$f'"; \
+ $(miscdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(miscdatadir)/$$f"; \
+ done
+@@ -799,7 +856,7 @@
+ uninstall-miscdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(miscdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(miscdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(miscdatadir)/$$f"; \
+ done
+@@ -808,7 +865,7 @@
+ test -z "$(kdeprintlprdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintlprdir)"
+ @list='$(kdeprintlpr_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdeprintlprHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeprintlprdir)/$$f'"; \
+ $(kdeprintlprHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeprintlprdir)/$$f"; \
+ done
+@@ -816,7 +873,7 @@
+ uninstall-kdeprintlprHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdeprintlpr_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdeprintlprdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdeprintlprdir)/$$f"; \
+ done
+@@ -922,7 +979,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeprint/management/Makefile.in
+++ kdeprint/management/Makefile.in
-@@ -347,6 +347,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,10 @@
+
+
+
++#>- SOURCES = $(kaddprinterwizard_la_SOURCES) $(libkdeprint_management_la_SOURCES) $(libkdeprint_management_module_la_SOURCES)
++#>+ 1
++SOURCES = $(kaddprinterwizard_la_SOURCES) $(libkdeprint_management_la_SOURCES) $(libkdeprint_management_module_la_SOURCES) $(kaddprinterwizard_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,16 +61,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dataicondir)" \
+- "$(DESTDIR)$(kdeprintdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(dataicondir)" "$(DESTDIR)$(kdeprintdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+@@ -138,31 +133,181 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/cjanuswidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/jobitem.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdeprint_management_module.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfilter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfonts.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiggeneral.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigjobs.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpreview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdbcreator.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdb.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdbwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmiconview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kminfopage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kminstancepage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmjobviewer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmlistview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmmainview.Plo ./$(DEPDIR)/kmpages.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmprinterview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbackend.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropcontainer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropdriver.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropertypage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropgeneral.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropmembers.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmpropwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmspecialprinterdlg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmtimer.Plo ./$(DEPDIR)/kmwbackend.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwclass.Plo ./$(DEPDIR)/kmwdriver.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwdriverselect.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwdrivertest.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwend.Plo ./$(DEPDIR)/kmwfile.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfobase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfopage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwizard.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwizardpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwlocal.Plo ./$(DEPDIR)/kmwlpd.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwname.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwpassword.Plo ./$(DEPDIR)/kmwsmb.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocket.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocketutil.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommanddlg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommandselector.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/networkscanner.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/pluginaction.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
++#>+ 102
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kaddprinterwizard.la.Po $(DEPDIR)/kaddprinterwizard_dummy.Plo $(DEPDIR)/libkdeprint_management_la.all_cpp.P ./$(DEPDIR)/cjanuswidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jobitem.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeprint_management_module.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfilter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfonts.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiggeneral.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigjobs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpreview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdbcreator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdb.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdbwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmiconview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kminfopage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kminstancepage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmjobviewer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlistview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmmainview.Plo ./$(DEPDIR)/kmpages.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmprinterview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbackend.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropcontainer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropdriver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropertypage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropgeneral.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropmembers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmspecialprinterdlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmtimer.Plo ./$(DEPDIR)/kmwbackend.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwclass.Plo ./$(DEPDIR)/kmwdriver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwdriverselect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwdrivertest.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwend.Plo ./$(DEPDIR)/kmwfile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfobase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfopage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwizard.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwizardpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwlocal.Plo ./$(DEPDIR)/kmwlpd.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwname.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwpassword.Plo ./$(DEPDIR)/kmwsmb.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocket.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocketutil.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommanddlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommandselector.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/networkscanner.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pluginaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kaddprinterwizard.la.Po $(DEPDIR)/kaddprinterwizard_dummy.Plo ./$(DEPDIR)/cjanuswidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/jobitem.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdeprint_management_module.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfilter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigfonts.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfiggeneral.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigjobs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigpreview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdbcreator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdb.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdbwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdriverdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmiconview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kminfopage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kminstancepage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmjobviewer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmlistview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmmainview.Plo ./$(DEPDIR)/kmpages.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmprinterview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropbackend.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropcontainer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropdriver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropertypage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropgeneral.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropmembers.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmpropwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmspecialprinterdlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmtimer.Plo ./$(DEPDIR)/kmwbackend.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwclass.Plo ./$(DEPDIR)/kmwdriver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwdriverselect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwdrivertest.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwend.Plo ./$(DEPDIR)/kmwfile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfobase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwinfopage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwizard.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwizardpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwlocal.Plo ./$(DEPDIR)/kmwlpd.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwname.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwpassword.Plo ./$(DEPDIR)/kmwsmb.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocket.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwsocketutil.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommanddlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlcommandselector.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/networkscanner.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/pluginaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(kaddprinterwizard_la_SOURCES) \
+-#>- $(libkdeprint_management_la_SOURCES) \
+-#>- $(libkdeprint_management_module_la_SOURCES)
+-#>+ 3
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kaddprinterwizard_la_SOURCES) \
+ $(libkdeprint_management_la_SOURCES) \
+- $(libkdeprint_management_module_la_SOURCES) $(kaddprinterwizard_SOURCES)
++ $(libkdeprint_management_module_la_SOURCES)
+ #>- DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \
+ #>- $(libkdeprint_management_la_SOURCES) \
+ #>- $(libkdeprint_management_module_la_SOURCES)
+@@ -191,6 +336,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -232,8 +379,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -310,7 +455,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -347,6 +491,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16408,7 +34204,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -644,7 +647,7 @@
+@@ -402,6 +549,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -411,8 +559,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -430,6 +576,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -644,7 +791,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16417,7 +34238,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -682,9 +685,9 @@
+@@ -682,16 +829,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16429,7 +34250,139 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1178,18 +1181,18 @@
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -699,8 +846,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -718,7 +865,7 @@
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -726,8 +873,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -745,7 +892,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -753,8 +900,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -877,21 +1024,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -908,7 +1058,7 @@
+ test -z "$(dataicondir)" || $(mkdir_p) "$(DESTDIR)$(dataicondir)"
+ @list='$(dataicon_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(dataiconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dataicondir)/$$f'"; \
+ $(dataiconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dataicondir)/$$f"; \
+ done
+@@ -916,7 +1066,7 @@
+ uninstall-dataiconDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dataicon_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(dataicondir)/$$f'"; \
+ rm -f "$(DESTDIR)$(dataicondir)/$$f"; \
+ done
+@@ -925,7 +1075,7 @@
+ test -z "$(kdeprintdir)" || $(mkdir_p) "$(DESTDIR)$(kdeprintdir)"
+ @list='$(kdeprint_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdeprintHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeprintdir)/$$f'"; \
+ $(kdeprintHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeprintdir)/$$f"; \
+ done
+@@ -933,7 +1083,7 @@
+ uninstall-kdeprintHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdeprint_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdeprintdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdeprintdir)/$$f"; \
+ done
+@@ -1041,7 +1191,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1178,18 +1328,18 @@
mocs: kmpropcontainer.moc
#>+ 3
@@ -16454,7 +34407,7 @@
#>+ 3
kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h
-@@ -1213,11 +1216,11 @@
+@@ -1213,11 +1363,11 @@
mocs: kmwclass.moc
#>+ 3
@@ -16469,7 +34422,7 @@
#>+ 3
pluginaction.moc: $(srcdir)/pluginaction.h
-@@ -1241,25 +1244,25 @@
+@@ -1241,25 +1391,25 @@
mocs: kxmlcommanddlg.moc
#>+ 3
@@ -16504,7 +34457,7 @@
#>+ 3
kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h
-@@ -1283,18 +1286,18 @@
+@@ -1283,18 +1433,18 @@
mocs: kmmainview.moc
#>+ 3
@@ -16529,7 +34482,7 @@
#>+ 3
cjanuswidget.moc: $(srcdir)/cjanuswidget.h
-@@ -1353,18 +1356,18 @@
+@@ -1353,18 +1503,18 @@
mocs: kmconfiggeneral.moc
#>+ 3
@@ -16554,7 +34507,7 @@
#>+ 3
smbview.moc: $(srcdir)/smbview.h
-@@ -1416,18 +1419,18 @@
+@@ -1416,18 +1566,18 @@
mocs: kmiconview.moc
#>+ 3
@@ -16579,7 +34532,7 @@
#>+ 8
libkdeprint_management_module.la.closure: $(libkdeprint_management_module_la_OBJECTS) $(libkdeprint_management_module_la_DEPENDENCIES)
-@@ -1440,7 +1443,7 @@
+@@ -1440,7 +1590,7 @@
#>+ 3
clean-metasources:
@@ -16588,7 +34541,7 @@
#>+ 2
KDE_DIST=Makefile.in side.png tileup.png tiledown.png Makefile.am
-@@ -1491,7 +1494,7 @@
+@@ -1491,7 +1641,7 @@
#>+ 11
@@ -16597,7 +34550,7 @@
@echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \
rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeprint_management_la.all_cpp.final; \
-@@ -1559,12 +1562,12 @@
+@@ -1559,12 +1709,12 @@
kmlistview.lo: kmlistview.moc
kmwsocketutil.lo: kmwsocketutil.moc
kmconfigdialog.lo: kmconfigdialog.moc
@@ -16614,7 +34567,58 @@
pluginaction.lo: pluginaction.moc
--- kdeprint/pics/Makefile.in
+++ kdeprint/pics/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(icondatadir)"
+ icondataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(icondata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16624,7 +34628,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -500,7 +496,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -16633,7 +34662,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -538,9 +534,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16645,7 +34674,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -704,7 +707,7 @@
+@@ -557,7 +553,7 @@
+ test -z "$(icondatadir)" || $(mkdir_p) "$(DESTDIR)$(icondatadir)"
+ @list='$(icondata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(icondataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondatadir)/$$f'"; \
+ $(icondataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondatadir)/$$f"; \
+ done
+@@ -565,7 +561,7 @@
+ uninstall-icondataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(icondata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(icondatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(icondatadir)/$$f"; \
+ done
+@@ -629,7 +625,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -704,7 +700,7 @@
.NOEXPORT:
#>+ 2
@@ -16654,7 +34710,7 @@
#>+ 2
docs-am:
-@@ -712,125 +715,125 @@
+@@ -712,125 +708,125 @@
#>+ 122
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(stdicondir)/crystalsvg/16x16/apps
@@ -16872,7 +34928,123 @@
force-reedit:
--- kdeprint/rlpr/Makefile.in
+++ kdeprint/rlpr/Makefile.in
-@@ -276,6 +276,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kdeprint_rlpr_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,12 +57,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(entrydir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+@@ -80,24 +76,49 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kmconfigproxy.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmproprlpr.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmproxywidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmrlpruimanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmwrlpr.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krlprprinterimpl.Plo
++#>+ 16
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdeprint_rlpr_la.all_cpp.P ./$(DEPDIR)/kmconfigproxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmproprlpr.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmproxywidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlpruimanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwrlpr.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krlprprinterimpl.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kmconfigproxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmproprlpr.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmproxywidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlprmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmrlpruimanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmwrlpr.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krlprprinterimpl.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_rlpr_la_SOURCES)
+ DIST_SOURCES = $(kdeprint_rlpr_la_SOURCES)
+ entryDATA_INSTALL = $(INSTALL_DATA)
+@@ -120,6 +141,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -161,8 +184,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -239,7 +260,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -276,6 +296,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16882,7 +35054,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -331,6 +354,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -340,8 +364,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -359,6 +381,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -537,7 +560,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16891,7 +35088,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -575,16 +598,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16903,9 +35100,171 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -592,8 +615,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -631,21 +654,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -662,7 +688,7 @@
+ test -z "$(entrydir)" || $(mkdir_p) "$(DESTDIR)$(entrydir)"
+ @list='$(entry_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(entryDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(entrydir)/$$f'"; \
+ $(entryDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -670,7 +696,7 @@
+ uninstall-entryDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(entry_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(entrydir)/$$f'"; \
+ rm -f "$(DESTDIR)$(entrydir)/$$f"; \
+ done
+@@ -776,7 +802,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeprint/tests/Makefile.in
+++ kdeprint/tests/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -70,24 +72,34 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/drawdemo.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/helpwindow.Po ./$(DEPDIR)/main.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/richpage.Po
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/helpviewer.all_cpp.P ./$(DEPDIR)/drawdemo.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/helpwindow.Po ./$(DEPDIR)/main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/richpage.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/drawdemo.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/helpwindow.Po ./$(DEPDIR)/main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/richpage.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
+ DIST_SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
+ ETAGS = etags
+@@ -107,6 +119,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -148,8 +162,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -226,7 +238,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -263,6 +274,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16915,7 +35274,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -318,6 +332,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -327,8 +342,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -346,6 +359,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -518,7 +532,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16924,7 +35308,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -556,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16936,9 +35320,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -589,21 +603,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -715,7 +732,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeprint/tools/Makefile.in
+++ kdeprint/tools/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -84,6 +84,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -125,8 +127,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -203,7 +203,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16948,7 +35407,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -295,6 +297,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,8 +307,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -323,6 +324,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -485,7 +487,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -16957,7 +35441,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -523,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16969,9 +35453,185 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -545,13 +547,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -563,7 +559,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -571,13 +567,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -598,7 +588,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -697,17 +687,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -736,7 +724,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeprint/tools/escputil/Makefile.in
+++ kdeprint/tools/escputil/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -75,24 +70,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/escpwidget.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/escpwidget.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
+ DIST_SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -115,6 +113,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -156,8 +156,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -234,7 +232,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -271,6 +268,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -16981,7 +35641,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -326,6 +326,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +336,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -354,6 +353,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -527,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16990,7 +35675,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -565,16 +565,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17002,9 +35687,203 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -582,8 +582,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -614,21 +614,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -645,7 +648,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -653,7 +656,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -759,7 +762,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdesu/Makefile.in
+++ kdesu/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -56,14 +58,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(kdesudir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdesudir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -87,32 +82,48 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/client.Plo ./$(DEPDIR)/kcookie.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_pty.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_stub.Po ./$(DEPDIR)/process.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ssh.Plo ./$(DEPDIR)/stub.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/su.Plo
++#>+ 10
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkdesu_la.all_cpp.P ./$(DEPDIR)/client.Plo ./$(DEPDIR)/kcookie.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_pty.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_stub.Po ./$(DEPDIR)/process.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ssh.Plo ./$(DEPDIR)/stub.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/su.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/client.Plo ./$(DEPDIR)/kcookie.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_pty.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesu_stub.Po ./$(DEPDIR)/process.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ssh.Plo ./$(DEPDIR)/stub.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/su.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
+ DIST_SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
+ kdesuHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -134,6 +145,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -175,8 +188,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -253,7 +264,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -290,6 +300,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17014,7 +35893,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -549,7 +552,7 @@
+@@ -345,6 +358,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -354,8 +368,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -373,6 +385,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -549,7 +562,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -17023,7 +35927,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +590,9 @@
+@@ -587,16 +600,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17035,9 +35939,553 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -604,8 +617,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -677,42 +690,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -729,7 +748,7 @@
+ test -z "$(kdesudir)" || $(mkdir_p) "$(DESTDIR)$(kdesudir)"
+ @list='$(kdesu_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdesuHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kdesudir)/$$f'"; \
+ $(kdesuHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kdesudir)/$$f"; \
+ done
+@@ -737,7 +756,7 @@
+ uninstall-kdesuHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdesu_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdesudir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdesudir)/$$f"; \
+ done
+@@ -846,7 +865,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -916,16 +935,15 @@
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+- install-data install-data-am install-data-hook \
+- install-data-local install-exec install-exec-am install-info \
+- install-info-am install-kdesuHEADERS install-libLTLIBRARIES \
+- install-man install-strip installcheck installcheck-am \
+- installdirs maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+- uninstall-kdesuHEADERS uninstall-libLTLIBRARIES \
+- uninstall-local
++ install-data install-data-am install-data-local install-exec \
++ install-exec-am install-info install-info-am \
++ install-kdesuHEADERS install-libLTLIBRARIES install-man \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-binPROGRAMS uninstall-info-am uninstall-kdesuHEADERS \
++ uninstall-libLTLIBRARIES uninstall-local
+
+
+ install-data-hook:
--- kdeui/Makefile.in
+++ kdeui/Makefile.in
-@@ -385,6 +385,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,6 +37,8 @@
+
+
+
++SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -76,15 +78,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(scriptsdir)" \
+- "$(DESTDIR)$(picsdir)" "$(DESTDIR)$(rcdir)" \
+- "$(DESTDIR)$(includedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(scriptsdir)" "$(DESTDIR)$(picsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(includedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libkdeui_la_DEPENDENCIES = ../kdecore/libkdecore.la
+@@ -173,24 +167,346 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dummy.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboutapplication.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboutkde.Plo ./$(DEPDIR)/kaction.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kactionclasses.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kactioncollection.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kactivelabel.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kanimwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/karrowbutton.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kauthicon.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbugreport.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuttonbox.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcharselect.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmenumngr.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmodule.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolorbutton.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolorcombo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolordialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolordrag.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcombobox.Plo ./$(DEPDIR)/kcommand.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbox.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcursor.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatepicker.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatetbl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatetimewidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatewidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdcopactionproxy.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdialogbase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget_private.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdualcolorbutton.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/keditcl1.Plo ./$(DEPDIR)/keditcl2.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/keditlistbox.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kedittoolbar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfontcombo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfontdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfontrequester.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kguiitem.Plo ./$(DEPDIR)/khelpmenu.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconviewsearchline.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kinputdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjanuswidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kkeybutton.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kkeydialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klanguagebutton.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kled.Plo ./$(DEPDIR)/klineedit.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klineeditdlg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klistbox.Plo ./$(DEPDIR)/klistview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klistviewsearchline.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindow.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowiface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmenubar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmessagebox.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knuminput.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knumvalidator.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpanelapplet.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpanelappmenu.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpanelextension.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpanelmenu.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpassdlg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpassivepopup.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapio.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectordialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectorwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpopupmenu.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprogress.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpushbutton.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krestrictedline.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krootpixmap.Plo ./$(DEPDIR)/kruler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksconfig.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kscrollview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kselect.Plo ./$(DEPDIR)/kseparator.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksharedpixmap.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspell.Plo ./$(DEPDIR)/kspelldlg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksplashscreen.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksqueezedtextlabel.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstatusbar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstdaction.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstdguiitem.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstringvalidator.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksyntaxhighlighter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksystemtray.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktabbar.Plo ./$(DEPDIR)/ktabctl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktabwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktextbrowser.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktextedit.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktimewidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonewidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktip.Plo ./$(DEPDIR)/ktoolbar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarbutton.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarhandler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarlabelaction.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarradiogroup.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurllabel.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwhatsthismanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwindowinfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwindowlistmenu.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwizard.Plo ./$(DEPDIR)/kwordwrap.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguibuilder.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguiclient.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory_p.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/qxembed.Plo
++#>+ 214
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kmainwindowiface_skel.P $(DEPDIR)/kshortcutdialog_simple.P $(DEPDIR)/kshortcutdialog_advanced.P $(DEPDIR)/kspellui.P $(DEPDIR)/libkdeui_la.all_cpp.P ./$(DEPDIR)/dummy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutapplication.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutkde.Plo ./$(DEPDIR)/kaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionclasses.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactioncollection.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactivelabel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kanimwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karrowbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kauthicon.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbugreport.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuttonbox.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharselect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmenumngr.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmodule.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolorbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolorcombo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolordialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolordrag.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcombobox.Plo ./$(DEPDIR)/kcommand.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbox.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcursor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatepicker.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatetbl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatetimewidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatewidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcopactionproxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdialogbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget_private.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdualcolorbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditcl1.Plo ./$(DEPDIR)/keditcl2.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditlistbox.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kedittoolbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontcombo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontrequester.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kguiitem.Plo ./$(DEPDIR)/khelpmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconviewsearchline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinputdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjanuswidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeybutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeydialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klanguagebutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kled.Plo ./$(DEPDIR)/klineedit.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klineeditdlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klistbox.Plo ./$(DEPDIR)/klistview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klistviewsearchline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindow.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowiface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenubar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmessagebox.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knuminput.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knumvalidator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelapplet.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelappmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelextension.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpassdlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpassivepopup.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectordialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectorwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpopupmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprogress.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpushbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krestrictedline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krootpixmap.Plo ./$(DEPDIR)/kruler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kscrollview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kselect.Plo ./$(DEPDIR)/kseparator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksharedpixmap.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell.Plo ./$(DEPDIR)/kspelldlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksplashscreen.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksqueezedtextlabel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstatusbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdguiitem.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringvalidator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksyntaxhighlighter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksystemtray.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabbar.Plo ./$(DEPDIR)/ktabctl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextbrowser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextedit.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimewidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonewidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktip.Plo ./$(DEPDIR)/ktoolbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarlabelaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarradiogroup.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurllabel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwhatsthismanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwindowinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwindowlistmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwizard.Plo ./$(DEPDIR)/kwordwrap.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguibuilder.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguiclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory_p.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/qxembed.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kmainwindowiface_skel.P $(DEPDIR)/kshortcutdialog_simple.P $(DEPDIR)/kshortcutdialog_advanced.P $(DEPDIR)/kspellui.P ./$(DEPDIR)/dummy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutapplication.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutkde.Plo ./$(DEPDIR)/kaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionclasses.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactioncollection.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactivelabel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kanimwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karrowbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kauthicon.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbugreport.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuttonbox.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharselect.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmenumngr.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmodule.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolorbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolorcombo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolordialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolordrag.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcombobox.Plo ./$(DEPDIR)/kcommand.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletionbox.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconfigdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcursor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatepicker.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatetbl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatetimewidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatewidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcopactionproxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdialogbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidget_private.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdualcolorbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditcl1.Plo ./$(DEPDIR)/keditcl2.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditlistbox.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kedittoolbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontcombo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontrequester.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kguiitem.Plo ./$(DEPDIR)/khelpmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconviewsearchline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinputdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjanuswidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeybutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kkeydialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klanguagebutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kled.Plo ./$(DEPDIR)/klineedit.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klineeditdlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klistbox.Plo ./$(DEPDIR)/klistview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klistviewsearchline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindow.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowiface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenubar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmessagebox.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knuminput.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knumvalidator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelapplet.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelappmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelextension.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpassdlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpassivepopup.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectordialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectorwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpopupmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprogress.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpushbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krestrictedline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krootpixmap.Plo ./$(DEPDIR)/kruler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kscrollview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kselect.Plo ./$(DEPDIR)/kseparator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksharedpixmap.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshortcutdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell.Plo ./$(DEPDIR)/kspelldlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksplashscreen.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksqueezedtextlabel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstatusbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstdguiitem.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstringvalidator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksyntaxhighlighter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksystemtray.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabbar.Plo ./$(DEPDIR)/ktabctl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextbrowser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextedit.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimewidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimezonewidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktip.Plo ./$(DEPDIR)/ktoolbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarlabelaction.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarradiogroup.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurllabel.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwhatsthismanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwindowinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwindowlistmenu.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwizard.Plo ./$(DEPDIR)/kwordwrap.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguibuilder.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguiclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguifactory_p.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/qxembed.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
+ DIST_SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -229,6 +545,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -270,8 +588,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -348,7 +664,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -385,6 +700,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17047,7 +36495,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -800,7 +803,7 @@
+@@ -440,6 +758,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -449,8 +768,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -468,6 +785,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -800,7 +1118,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17056,7 +36529,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -838,9 +841,9 @@
+@@ -838,16 +1156,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17068,7 +36541,187 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1559,11 +1562,11 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -855,8 +1173,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -1032,21 +1350,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -1063,7 +1384,7 @@
+ test -z "$(picsdir)" || $(mkdir_p) "$(DESTDIR)$(picsdir)"
+ @list='$(pics_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(picsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(picsdir)/$$f'"; \
+ $(picsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(picsdir)/$$f"; \
+ done
+@@ -1071,7 +1392,7 @@
+ uninstall-picsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pics_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(picsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(picsdir)/$$f"; \
+ done
+@@ -1080,7 +1401,7 @@
+ test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+ @list='$(rc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
+ $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
+ done
+@@ -1088,7 +1409,7 @@
+ uninstall-rcDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(rc_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(rcdir)/$$f"; \
+ done
+@@ -1097,7 +1418,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -1105,7 +1426,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -1117,13 +1438,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1135,7 +1450,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -1143,13 +1458,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -1170,7 +1479,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1270,17 +1579,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1312,7 +1619,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1559,11 +1866,11 @@
mocs: kcompletionbox.moc
#>+ 3
@@ -17083,7 +36736,7 @@
#>+ 3
kactionclasses.moc: $(srcdir)/kactionclasses.h
-@@ -1573,11 +1576,11 @@
+@@ -1573,11 +1880,11 @@
mocs: kactionclasses.moc
#>+ 3
@@ -17098,7 +36751,7 @@
#>+ 3
kshortcutdialog.moc: $(srcdir)/kshortcutdialog.h
-@@ -1601,18 +1604,18 @@
+@@ -1601,18 +1908,18 @@
mocs: kdialogbase.moc
#>+ 3
@@ -17123,7 +36776,7 @@
#>+ 3
kbuttonbox.moc: $(srcdir)/kbuttonbox.h
-@@ -1678,13 +1681,6 @@
+@@ -1678,13 +1985,6 @@
mocs: kpassdlg.moc
#>+ 3
@@ -17137,7 +36790,7 @@
klineeditdlg.moc: $(srcdir)/klineeditdlg.h
$(MOC) $(srcdir)/klineeditdlg.h -o klineeditdlg.moc
-@@ -1692,11 +1688,11 @@
+@@ -1692,11 +1992,11 @@
mocs: klineeditdlg.moc
#>+ 3
@@ -17152,7 +36805,7 @@
#>+ 3
kkeybutton.moc: $(srcdir)/kkeybutton.h
-@@ -1706,6 +1702,13 @@
+@@ -1706,6 +2006,13 @@
mocs: kkeybutton.moc
#>+ 3
@@ -17166,7 +36819,7 @@
kpopupmenu.moc: $(srcdir)/kpopupmenu.h
$(MOC) $(srcdir)/kpopupmenu.h -o kpopupmenu.moc
-@@ -1720,18 +1723,18 @@
+@@ -1720,18 +2027,18 @@
mocs: kmainwindow.moc
#>+ 3
@@ -17191,7 +36844,7 @@
#>+ 3
ktabwidget.moc: $(srcdir)/ktabwidget.h
-@@ -1769,6 +1772,13 @@
+@@ -1769,6 +2076,13 @@
mocs: kaction.moc
#>+ 3
@@ -17205,7 +36858,7 @@
kiconviewsearchline.moc: $(srcdir)/kiconviewsearchline.h
$(MOC) $(srcdir)/kiconviewsearchline.h -o kiconviewsearchline.moc
-@@ -1783,11 +1793,11 @@
+@@ -1783,11 +2097,11 @@
mocs: ktextbrowser.moc
#>+ 3
@@ -17220,7 +36873,7 @@
#>+ 3
khelpmenu.moc: $(srcdir)/khelpmenu.h
-@@ -1797,13 +1807,6 @@
+@@ -1797,13 +2111,6 @@
mocs: khelpmenu.moc
#>+ 3
@@ -17234,7 +36887,7 @@
kdatewidget.moc: $(srcdir)/kdatewidget.h
$(MOC) $(srcdir)/kdatewidget.h -o kdatewidget.moc
-@@ -1818,13 +1821,6 @@
+@@ -1818,13 +2125,6 @@
mocs: ktoolbarradiogroup.moc
#>+ 3
@@ -17248,7 +36901,7 @@
kaboutdialog_private.moc: $(srcdir)/kaboutdialog_private.h
$(MOC) $(srcdir)/kaboutdialog_private.h -o kaboutdialog_private.moc
-@@ -1839,18 +1835,18 @@
+@@ -1839,18 +2139,18 @@
mocs: kanimwidget.moc
#>+ 3
@@ -17273,7 +36926,7 @@
#>+ 3
ktimewidget.moc: $(srcdir)/ktimewidget.h
-@@ -1860,11 +1856,11 @@
+@@ -1860,11 +2160,11 @@
mocs: ktimewidget.moc
#>+ 3
@@ -17288,7 +36941,7 @@
#>+ 3
klistviewsearchline.moc: $(srcdir)/klistviewsearchline.h
-@@ -1874,6 +1870,13 @@
+@@ -1874,6 +2174,13 @@
mocs: klistviewsearchline.moc
#>+ 3
@@ -17302,7 +36955,7 @@
klanguagebutton.moc: $(srcdir)/klanguagebutton.h
$(MOC) $(srcdir)/klanguagebutton.h -o klanguagebutton.moc
-@@ -1916,18 +1919,18 @@
+@@ -1916,18 +2223,18 @@
mocs: kfontdialog.moc
#>+ 3
@@ -17327,7 +36980,7 @@
#>+ 3
kurllabel.moc: $(srcdir)/kurllabel.h
-@@ -1986,11 +1989,11 @@
+@@ -1986,11 +2293,11 @@
mocs: kedittoolbar.moc
#>+ 3
@@ -17342,7 +36995,7 @@
#>+ 3
ktimezonewidget.moc: $(srcdir)/ktimezonewidget.h
-@@ -2000,11 +2003,11 @@
+@@ -2000,11 +2307,11 @@
mocs: ktimezonewidget.moc
#>+ 3
@@ -17357,7 +37010,7 @@
#>+ 3
klineedit.moc: $(srcdir)/klineedit.h
-@@ -2189,18 +2192,18 @@
+@@ -2189,18 +2496,18 @@
mocs: kdockwidget_private.moc
#>+ 3
@@ -17382,7 +37035,7 @@
#>+ 3
kcolordialog.moc: $(srcdir)/kcolordialog.h
-@@ -2290,7 +2293,7 @@
+@@ -2290,7 +2597,7 @@
#>+ 3
clean-metasources:
@@ -17391,7 +37044,7 @@
#>+ 2
KDE_DIST=TODO.xmlgui libkdeui.nmcheck Makefile.in aboutkde.png ktoolbarhandler.h libkdeui_weak.nmcheck MAINTAINERS kshortcutdialog_advanced.ui kspellui.ui ui_standards.rc ktip-bulb.png preparetips ktip-background.png kshortcutdialog_simple.ui TODO.kspell README.kspell kxmlgui.xsd Makefile.am
-@@ -2353,7 +2356,7 @@
+@@ -2353,7 +2660,7 @@
#>+ 11
@@ -17402,7 +37055,58 @@
echo "#define KDE_USE_FINAL 1" >> libkdeui_la.all_cpp.final; \
--- kdeui/about/Makefile.in
+++ kdeui/about/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_infopage_datadir)"
+ kde_infopage_dataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(kde_infopage_data_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17412,7 +37116,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -487,7 +483,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17421,7 +37150,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -525,9 +521,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17433,9 +37162,74 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -544,7 +540,7 @@
+ test -z "$(kde_infopage_datadir)" || $(mkdir_p) "$(DESTDIR)$(kde_infopage_datadir)"
+ @list='$(kde_infopage_data_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_infopage_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_infopage_datadir)/$$f'"; \
+ $(kde_infopage_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_infopage_datadir)/$$f"; \
+ done
+@@ -552,7 +548,7 @@
+ uninstall-kde_infopage_dataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_infopage_data_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_infopage_datadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_infopage_datadir)/$$f"; \
+ done
+@@ -616,7 +612,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeui/colors/Makefile.in
+++ kdeui/colors/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -68,6 +68,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -109,8 +111,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -187,7 +187,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -224,6 +223,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17445,7 +37239,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -279,6 +281,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -288,8 +291,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -307,6 +308,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -468,7 +470,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17454,7 +37273,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -506,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17466,9 +37285,119 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -577,7 +579,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeui/kdetrayproxy/Makefile.in
+++ kdeui/kdetrayproxy/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kded_kdetrayproxy_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -78,24 +73,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kdetrayproxy.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/module.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/module_skel.P $(DEPDIR)/kded_kdetrayproxy_la.all_cpp.P ./$(DEPDIR)/kdetrayproxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/module.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/module_skel.P ./$(DEPDIR)/kdetrayproxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/module.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_kdetrayproxy_la_SOURCES)
+ DIST_SOURCES = $(kded_kdetrayproxy_la_SOURCES)
+ servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -118,6 +120,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -159,8 +163,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -237,7 +239,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,6 +275,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17478,7 +37407,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -329,6 +333,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,8 +343,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -357,6 +360,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -530,7 +534,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17487,7 +37441,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -568,16 +572,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17499,9 +37453,276 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -585,8 +589,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -615,21 +619,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -646,7 +653,7 @@
+ test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+ @list='$(services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
+ $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -654,7 +661,7 @@
+ uninstall-servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -760,7 +767,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdeui/tests/Makefile.in
+++ kdeui/tests/Makefile.in
-@@ -698,6 +698,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -33,6 +33,8 @@
+ # along with this library; see the file COPYING.LIB. If not, write to
+ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ # Boston, MA 02110-1301, USA.
++SOURCES = $(itemcontainertest_SOURCES) $(kaboutdialogtest_SOURCES) $(kaccelgentest_SOURCES) $(kactiontest_SOURCES) $(kblendtest_SOURCES) $(kbuttonboxtest_SOURCES) $(kcharselecttest_SOURCES) $(kcolordlgtest_SOURCES) $(kcolortest_SOURCES) $(kcomboboxtest_SOURCES) $(kcompletiontest_SOURCES) $(kdatepicktest_SOURCES) $(kdatetimewidgettest_SOURCES) $(kdatewidgettest_SOURCES) $(kdesattest_SOURCES) $(kdialogbasetest_SOURCES) $(kdocktest_SOURCES) $(kdockwidgetdemo_SOURCES) $(kdockwidgettest_SOURCES) $(kdualcolortest_SOURCES) $(keditlistboxtest_SOURCES) $(kedittest_SOURCES) $(kfontdialogtest_SOURCES) $(kgradienttest_SOURCES) $(khashtest_SOURCES) $(kinputdialogtest_SOURCES) $(kjanuswidgettest_SOURCES) $(kledtest_SOURCES) $(klineeditdlgtest_SOURCES) $(klineedittest_SOURCES) $(klistviewtest_SOURCES) $(kmainwindowrestoretest_SOURCES) $(kmainwindowtest_SOURCES) $(kmessageboxtest_SOURCES) $(knuminputtest_SOURCES) $(kpalettetest_SOURCES) $(kpanelmenutest_SOURCES) $(kpixmapregionselectordialogtest_SOURCES) $(kpopuptest_SOURCES) $(kprogresstest_SOURCES) $(krulertest_SOURCES) $(kseparatortest_SOURCES) $(kspelltest_SOURCES) $(ksqueezedtextlabeltest_SOURCES) $(kstatusbartest_SOURCES) $(ksystemtraytest_SOURCES) $(ktabctltest_SOURCES) $(ktabwidgettest_SOURCES) $(ktextedittest_SOURCES) $(ktimewidgettest_SOURCES) $(ktoolbarlabelactiontest_SOURCES) $(kunbalancedgrdtest_SOURCES) $(kwindowtest_SOURCES) $(kwizardtest_SOURCES) $(kwordwraptest_SOURCES) $(kxmlguitest_SOURCES) $(qxembedtest_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -447,24 +449,139 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/itemcontainertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdialogtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccelgentest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kactiontest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kblendtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuttonboxtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcharselecttest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolordlgtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcolortest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcomboboxtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcompletiontest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatepicktest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatetimewidgettest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatewidgettest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdesattest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdialogbasetest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdocktest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidgetdemo.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidgettest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdualcolortest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/keditlistboxtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kedittest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfontdialogtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kgradienttest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khashtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kinputdialogtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjanuswidgettest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kledtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klineeditdlgtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klineedittest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klistviewtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowrestoretest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmessageboxtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knuminputtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpalettetest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpanelmenutest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectordialogtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpopuptest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprogresstest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krulertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kseparatortest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspelltest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksqueezedtextlabeltest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstatusbartest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksystemtraytest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktabctltest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktabwidgettest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktextedittest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktimewidgettest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarlabelactiontest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kunbalancedgrdtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwindowtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwizardtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwordwraptest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguitest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/qxembedtest.Po
++#>+ 57
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/itemcontainertest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaboutdialogtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccelgentest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactiontest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kblendtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuttonboxtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcharselecttest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolordlgtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcolortest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcomboboxtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcompletiontest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatepicktest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatetimewidgettest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatewidgettest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesattest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdialogbasetest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdocktest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidgetdemo.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdockwidgettest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdualcolortest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditlistboxtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kedittest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfontdialogtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kgradienttest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khashtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinputdialogtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjanuswidgettest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kledtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klineeditdlgtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klineedittest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klistviewtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowrestoretest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmainwindowtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmessageboxtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knuminputtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpalettetest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpanelmenutest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpixmapregionselectordialogtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpopuptest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprogresstest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krulertest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kseparatortest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspelltest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksqueezedtextlabeltest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstatusbartest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksystemtraytest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabctltest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktabwidgettest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextedittest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktimewidgettest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktoolbarlabelactiontest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kunbalancedgrdtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwindowtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwizardtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwordwraptest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlguitest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/qxembedtest.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(itemcontainertest_SOURCES) $(kaboutdialogtest_SOURCES) \
+ $(kaccelgentest_SOURCES) $(kactiontest_SOURCES) \
+ $(kblendtest_SOURCES) $(kbuttonboxtest_SOURCES) \
+@@ -542,6 +659,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -583,8 +702,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -661,7 +778,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -698,6 +814,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17511,7 +37732,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -1006,7 +1009,7 @@
+@@ -753,6 +872,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -762,8 +882,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -781,6 +899,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -1006,7 +1125,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17520,7 +37766,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -1044,9 +1047,9 @@
+@@ -1044,9 +1163,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17532,7 +37778,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-@@ -1499,18 +1502,18 @@
+@@ -1295,21 +1414,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -1421,7 +1543,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1499,18 +1621,18 @@
.NOEXPORT:
#>+ 3
@@ -17557,7 +37840,7 @@
#>+ 3
kstatusbartest.moc: $(srcdir)/kstatusbartest.h
-@@ -1534,18 +1537,18 @@
+@@ -1534,18 +1656,18 @@
mocs: khashtest.moc
#>+ 3
@@ -17582,7 +37865,7 @@
#>+ 3
kcompletiontest.moc: $(srcdir)/kcompletiontest.h
-@@ -1625,18 +1628,18 @@
+@@ -1625,18 +1747,18 @@
mocs: kdesattest.moc
#>+ 3
@@ -17607,7 +37890,7 @@
#>+ 3
kunbalancedgrdtest.moc: $(srcdir)/kunbalancedgrdtest.h
-@@ -1654,7 +1657,7 @@
+@@ -1654,7 +1776,7 @@
#>+ 3
clean-metasources:
@@ -17618,7 +37901,108 @@
KDE_DIST=kdockwidgettest.h background_1.png kmainwindowtest.h Makefile.in kmainwindowrestoretest.h ktoolbarlabelactiontestui.rc ktabwidgettest.h kcompletiontest.h kstatusbartest.h kxmlguitest_shell.rc kunbalancedgrdtest.h ktabctltest.h kdocktest.h knuminputtest.h kdualcolortest.h RayTracedGear.png kxmlguitest.h khashtest.h kwindowtest.h klineedittest.h kledtest.h kcomboboxtest.h kdockwidgetdemo.h krulertest.h kcolortest.h kalphaicontest.h kblendtest.h kgradienttest.h itemcontainertest.h kxmlguitest_part.rc kpanelmenutest.h testimage.png go.png kdesattest.h Makefile.am
--- kdewidgets/Makefile.in
+++ kdewidgets/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -74,12 +76,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_widgetdir)" "$(DESTDIR)$(bindir)"
+ kde_widgetLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_widget_LTLIBRARIES)
+@@ -104,24 +100,34 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/classpreviews.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdewidgets.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/makekdewidgets.Po
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kdewidgets_la.all_cpp.P ./$(DEPDIR)/classpreviews.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdewidgets.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/makekdewidgets.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/classpreviews.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdewidgets.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/makekdewidgets.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
+ DIST_SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -155,6 +161,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -196,8 +204,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -274,7 +280,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -311,6 +316,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17628,7 +38012,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -366,6 +374,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -375,8 +384,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -394,6 +401,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -567,7 +575,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17637,7 +38046,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -605,16 +613,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17649,9 +38058,186 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_widgetLTLIBRARIES: $(kde_widget_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_widgetdir)" || $(mkdir_p) "$(DESTDIR)$(kde_widgetdir)"
+ @list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_widgetLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_widgetdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_widgetLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_widgetdir)/$$f"; \
+ else :; fi; \
+@@ -622,8 +630,8 @@
+
+ uninstall-kde_widgetLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_widget_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_widgetdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_widgetdir)/$$p"; \
+ done
+@@ -687,21 +695,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -721,13 +732,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -739,7 +744,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -747,13 +752,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -774,7 +773,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -873,17 +872,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -916,7 +913,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdewidgets/pics/Makefile.in
+++ kdewidgets/pics/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kdewidgetsdatadir)"
+ kdewidgetsdataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(kdewidgetsdata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17661,7 +38247,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -493,7 +489,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17670,7 +38281,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -531,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17682,9 +38293,74 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -550,7 +546,7 @@
+ test -z "$(kdewidgetsdatadir)" || $(mkdir_p) "$(DESTDIR)$(kdewidgetsdatadir)"
+ @list='$(kdewidgetsdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdewidgetsdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdewidgetsdatadir)/$$f'"; \
+ $(kdewidgetsdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdewidgetsdatadir)/$$f"; \
+ done
+@@ -558,7 +554,7 @@
+ uninstall-kdewidgetsdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdewidgetsdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdewidgetsdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdewidgetsdatadir)/$$f"; \
+ done
+@@ -622,7 +618,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdewidgets/tests/Makefile.in
+++ kdewidgets/tests/Makefile.in
-@@ -243,6 +243,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -87,6 +87,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -128,8 +130,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -206,7 +206,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -243,6 +242,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17694,7 +38370,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -298,6 +300,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -307,8 +310,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -326,6 +327,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -488,7 +490,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -17703,7 +38404,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -526,9 +528,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17715,9 +38416,53 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -599,7 +601,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kdoctools/Makefile.in
+++ kdoctools/Makefile.in
-@@ -72,7 +72,8 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -19,6 +19,8 @@
+
+
+
++SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) $(libkbzipfilter_dummy_la_SOURCES) $(meinproc_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -59,20 +61,13 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES = checkXML
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(updatedir)" \
+- "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(updatedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(updatedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
kio_ghelp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -17727,7 +38472,7 @@
am_kio_ghelp_la_OBJECTS = kio_help.lo main_ghelp.lo xslt.lo
#>- kio_ghelp_la_OBJECTS = $(am_kio_ghelp_la_OBJECTS)
#>+ 4
-@@ -81,7 +82,8 @@
+@@ -81,7 +76,8 @@
@KDE_USE_FINAL_FALSE at kio_ghelp_la_OBJECTS = $(kio_ghelp_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at kio_ghelp_la_OBJECTS = $(kio_ghelp_la_final_OBJECTS)
kio_help_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -17737,7 +38482,7 @@
am_kio_help_la_OBJECTS = kio_help.lo main.lo xslt.lo
#>- kio_help_la_OBJECTS = $(am_kio_help_la_OBJECTS)
#>+ 4
-@@ -89,8 +91,7 @@
+@@ -89,8 +85,7 @@
kio_help_la_nofinal_OBJECTS = kio_help.lo main.lo xslt.lo
@KDE_USE_FINAL_FALSE at kio_help_la_OBJECTS = $(kio_help_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at kio_help_la_OBJECTS = $(kio_help_la_final_OBJECTS)
@@ -17747,7 +38492,7 @@
am_libkbzipfilter_dummy_la_OBJECTS = kbzip2filter.lo
#>- libkbzipfilter_dummy_la_OBJECTS = \
#>- $(am_libkbzipfilter_dummy_la_OBJECTS)
-@@ -103,6 +104,7 @@
+@@ -103,6 +98,7 @@
#>+ 1
meinproc_OBJECTS = meinproc.$(OBJEXT)
meinproc_DEPENDENCIES = xslt_pure.o libkbzipfilter_dummy.la \
@@ -17755,7 +38500,77 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
updateSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-@@ -309,6 +311,9 @@
+@@ -110,24 +106,37 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kbzip2filter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kio_help.Plo ./$(DEPDIR)/main.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/main_ghelp.Plo ./$(DEPDIR)/meinproc.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/xslt.Plo
++#>+ 8
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kio_ghelp_la.all_cpp.P $(DEPDIR)/kio_help_la.all_cpp.P ./$(DEPDIR)/kbzip2filter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kio_help.Plo ./$(DEPDIR)/main.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main_ghelp.Plo ./$(DEPDIR)/meinproc.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xslt.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kbzip2filter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kio_help.Plo ./$(DEPDIR)/main.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main_ghelp.Plo ./$(DEPDIR)/meinproc.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/xslt.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) \
+ $(libkbzipfilter_dummy_la_SOURCES) $(meinproc_SOURCES)
+ DIST_SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) \
+@@ -153,6 +162,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -194,8 +205,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -272,7 +281,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -309,6 +317,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17765,7 +38580,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,20 +557,19 @@
+@@ -364,6 +375,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -373,8 +385,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -392,6 +402,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -552,20 +563,19 @@
AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries)
noinst_LTLIBRARIES = libkbzipfilter_dummy.la
libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
@@ -17789,7 +38629,7 @@
meinproc_SOURCES = meinproc.cpp
bin_SCRIPTS = checkXML
#>- METASOURCES = AUTO
-@@ -579,7 +583,7 @@
+@@ -579,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17798,7 +38638,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +621,9 @@
+@@ -617,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17810,9 +38650,102 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -1154,7 +1158,7 @@
+@@ -628,7 +638,7 @@
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -636,8 +646,8 @@
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -758,21 +768,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -789,7 +802,7 @@
+ test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -797,7 +810,7 @@
+ uninstall-kdelnkDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -806,7 +819,7 @@
+ test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+ @list='$(update_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
+ $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+@@ -814,7 +827,7 @@
+ uninstall-updateDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(update_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+@@ -923,7 +936,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1154,7 +1167,7 @@
+
+
#>+ 2
-KDE_DIST=kio_help.upd move_kio_help_cache.sh Makefile.in man-template.docbook LICENSE configure.in.in kbuildsycoca.man.docbook kbuildsycoca.refentry.docbook template.docbook xslt.h help.protocol ghelp.protocol checkXML.in Makefile.am
+KDE_DIST=kio_help.upd move_kio_help_cache.sh Makefile.in man-template.docbook LICENSE configure.in.in template.docbook xslt.h help.protocol ghelp.protocol checkXML.in Makefile.am
@@ -17821,7 +38754,151 @@
clean-closures:
--- khtml/Makefile.in
+++ khtml/Makefile.in
-@@ -369,6 +369,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -36,6 +36,8 @@
+
+
+
++SOURCES = $(khtmlimagepart_la_SOURCES) $(libkhtml_la_SOURCES) $(libkhtmlpart_la_SOURCES) $(testkhtml_SOURCES) $(testkhtml_static_SOURCES) $(testregression_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -77,15 +79,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(servicedir)" \
+- "$(DESTDIR)$(includedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(includedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -152,24 +146,73 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/domtreeview.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/imgdummy.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_events.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_ext.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_factory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_iface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_pagecache.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_part.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_printsettings.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_run.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtml_settings.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtmlimage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khtmlview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_regression.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_regression_fontoverload.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testkhtml.Po
++#>+ 32
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/khtml_iface_skel.P $(DEPDIR)/kjserrordlg.P $(DEPDIR)/htmlpageinfo.P $(DEPDIR)/libkhtml_la.all_cc.P $(DEPDIR)/libkhtml_la.all_cpp.P $(DEPDIR)/testkhtml.all_cpp.P $(DEPDIR)/testkhtml_static.all_cpp.P $(DEPDIR)/testregression.all_cpp.P ./$(DEPDIR)/domtreeview.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/imgdummy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_events.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_ext.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_factory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_iface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_pagecache.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_part.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_printsettings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_run.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_settings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtmlimage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtmlview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_regression.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_regression_fontoverload.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testkhtml.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/khtml_iface_skel.P $(DEPDIR)/kjserrordlg.P $(DEPDIR)/htmlpageinfo.P ./$(DEPDIR)/domtreeview.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/imgdummy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_events.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_ext.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_factory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_iface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_pagecache.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_part.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_printsettings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_run.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtml_settings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtmlimage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khtmlview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_regression.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_regression_fontoverload.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testkhtml.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(khtmlimagepart_la_SOURCES) $(libkhtml_la_SOURCES) \
+ $(libkhtmlpart_la_SOURCES) $(testkhtml_SOURCES) \
+ $(testkhtml_static_SOURCES) $(testregression_SOURCES)
+@@ -213,6 +256,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -254,8 +299,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -332,7 +375,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -369,6 +411,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17831,7 +38908,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -689,7 +692,7 @@
+@@ -424,6 +469,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -433,8 +479,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -452,6 +496,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -689,7 +734,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -17840,7 +38942,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -727,9 +730,9 @@
+@@ -727,16 +772,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17852,9 +38954,346 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -744,8 +789,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -763,7 +808,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -771,8 +816,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -845,42 +890,48 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -897,7 +948,7 @@
+ test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+ @list='$(rc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
+ $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
+ done
+@@ -905,7 +956,7 @@
+ uninstall-rcDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(rc_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(rcdir)/$$f"; \
+ done
+@@ -914,7 +965,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -922,7 +973,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -931,7 +982,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -939,7 +990,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -951,13 +1002,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -969,7 +1014,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -977,13 +1022,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -1004,7 +1043,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1107,14 +1146,12 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1148,7 +1185,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- khtml/css/Makefile.in
+++ khtml/css/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -36,6 +36,8 @@
+
+
+
++SOURCES = $(libkhtmlcss_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -90,32 +92,54 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/css_base.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_renderstyledeclarationimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_ruleimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheetimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_valueimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/csshelper.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cssparser.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/cssstyleselector.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/parser.Plo
++#>+ 18
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmlcss_la.all_cpp.P ./$(DEPDIR)/css_base.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_renderstyledeclarationimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_ruleimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheetimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_valueimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/csshelper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cssparser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/cssstyleselector.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/parser.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/css_base.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_renderstyledeclarationimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_ruleimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheetimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_valueimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/csshelper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cssparser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/cssstyleselector.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/parser.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlcss_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlcss_la_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(cssdir)"
+ cssDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(css_DATA)
+@@ -137,6 +161,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -178,8 +204,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -256,7 +280,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -293,6 +316,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17864,7 +39303,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -348,6 +374,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +384,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -376,6 +401,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -564,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17873,7 +39337,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -602,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17885,7 +39349,62 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -872,7 +875,7 @@
+@@ -638,21 +664,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -669,7 +698,7 @@
+ test -z "$(cssdir)" || $(mkdir_p) "$(DESTDIR)$(cssdir)"
+ @list='$(css_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(cssDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cssdir)/$$f'"; \
+ $(cssDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cssdir)/$$f"; \
+ done
+@@ -677,7 +706,7 @@
+ uninstall-cssDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(css_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(cssdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(cssdir)/$$f"; \
+ done
+@@ -783,7 +812,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -872,7 +901,7 @@
.NOEXPORT:
#>+ 2
@@ -17896,7 +39415,163 @@
docs-am:
--- khtml/dom/Makefile.in
+++ khtml/dom/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(libkhtmldom_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -97,32 +99,96 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/css_rule.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheet.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/css_value.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_events.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_range.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversal.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_views.Plo ./$(DEPDIR)/dom_doc.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_element.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_misc.Plo ./$(DEPDIR)/dom_node.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_string.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_text.Plo ./$(DEPDIR)/dom_xml.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_base.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_block.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_document.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_element.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_form.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_head.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_image.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_inline.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_list.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_misc.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_table.Plo
++#>+ 46
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmldom_la.all_cpp.P ./$(DEPDIR)/css_rule.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheet.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_value.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_events.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_range.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversal.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_views.Plo ./$(DEPDIR)/dom_doc.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_element.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_misc.Plo ./$(DEPDIR)/dom_node.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_string.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_text.Plo ./$(DEPDIR)/dom_xml.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_base.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_block.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_document.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_element.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_form.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_head.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_image.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_inline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_list.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_misc.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_table.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/css_rule.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_stylesheet.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/css_value.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_events.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_range.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversal.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_views.Plo ./$(DEPDIR)/dom_doc.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_element.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_misc.Plo ./$(DEPDIR)/dom_node.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_string.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_text.Plo ./$(DEPDIR)/dom_xml.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_base.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_block.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_document.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_element.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_form.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_head.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_image.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_inline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_list.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_misc.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_table.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkhtmldom_la_SOURCES)
+ DIST_SOURCES = $(libkhtmldom_la_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(myincludedir)"
+ myincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(myinclude_HEADERS)
+@@ -143,6 +209,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -184,8 +252,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -262,7 +328,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -299,6 +364,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17906,7 +39581,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -354,6 +422,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -363,8 +432,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -382,6 +449,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -575,7 +643,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17915,7 +39615,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -613,9 +681,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17927,9 +39627,188 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -666,21 +734,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -697,7 +768,7 @@
+ test -z "$(myincludedir)" || $(mkdir_p) "$(DESTDIR)$(myincludedir)"
+ @list='$(myinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(myincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(myincludedir)/$$f'"; \
+ $(myincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(myincludedir)/$$f"; \
+ done
+@@ -705,7 +776,7 @@
+ uninstall-myincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(myinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(myincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(myincludedir)/$$f"; \
+ done
+@@ -811,7 +882,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- khtml/ecma/Makefile.in
+++ khtml/ecma/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,6 +34,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(libkjs_html_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -92,24 +94,70 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/domparser.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_binding.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_css.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_debugwin.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_dom.Plo ./$(DEPDIR)/kjs_events.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_html.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_mozilla.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_navigator.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_proxy.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_range.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_traversal.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_views.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjs_window.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/xmlhttprequest.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/xmlserializer.Plo
++#>+ 30
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkjs_html_la.all_cpp.P ./$(DEPDIR)/domparser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_binding.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_css.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_debugwin.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_dom.Plo ./$(DEPDIR)/kjs_events.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_html.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_mozilla.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_navigator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_proxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_range.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_traversal.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_views.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_window.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xmlhttprequest.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xmlserializer.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/domparser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_binding.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_css.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_debugwin.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_dom.Plo ./$(DEPDIR)/kjs_events.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_html.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_mozilla.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_navigator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_proxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_range.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_traversal.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_views.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjs_window.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/xmlhttprequest.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/xmlserializer.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkjs_html_la_SOURCES)
+ DIST_SOURCES = $(libkjs_html_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -130,6 +178,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -171,8 +221,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -249,7 +297,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -286,6 +333,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17939,7 +39818,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -341,6 +391,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,8 +401,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -369,6 +418,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -552,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17948,7 +39852,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17960,9 +39864,170 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -633,21 +683,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -759,7 +812,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- khtml/html/Makefile.in
+++ khtml/html/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(libkhtmlhtml_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -93,24 +95,70 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dtd.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_baseimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_blockimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_documentimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_elementimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_formimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_headimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_imageimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_inlineimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_listimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_miscimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_objectimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/html_tableimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/htmlparser.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/htmltokenizer.Plo
++#>+ 30
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmlhtml_la.all_cpp.P ./$(DEPDIR)/dtd.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_baseimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_blockimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_documentimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_elementimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_formimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_headimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_imageimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_inlineimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_listimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_miscimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_objectimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_tableimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmlparser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmltokenizer.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/dtd.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_baseimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_blockimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_documentimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_elementimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_formimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_headimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_imageimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_inlineimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_listimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_miscimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_objectimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/html_tableimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmlparser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmltokenizer.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlhtml_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlhtml_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -131,6 +179,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -172,8 +222,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -250,7 +298,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -287,6 +334,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -17972,7 +40037,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -342,6 +392,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -351,8 +402,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -370,6 +419,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -557,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17981,7 +40071,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -595,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17993,9 +40083,162 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -637,21 +687,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -762,7 +815,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- khtml/java/Makefile.in
+++ khtml/java/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES = kjava.policy
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kjavadatadir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(kjavadatadir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -93,24 +88,46 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kjavaapplet.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletcontext.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletserver.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletviewer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavadownloader.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjavaprocess.Plo
++#>+ 14
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kjavaappletviewer_la.all_cpp.P $(DEPDIR)/libkjava_la.all_cpp.P ./$(DEPDIR)/kjavaapplet.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletcontext.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletserver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletviewer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavadownloader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaprocess.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kjavaapplet.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletcontext.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletserver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletviewer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaappletwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavadownloader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjavaprocess.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
+ DIST_SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -148,6 +165,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -189,8 +208,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -267,7 +284,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -304,6 +320,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18005,7 +40248,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -359,6 +378,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -368,8 +388,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -387,6 +405,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -581,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18014,7 +40282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18026,7 +40294,170 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
kjava.policy: $(top_builddir)/config.status $(srcdir)/kjava.policy.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -1070,13 +1073,6 @@
+@@ -630,7 +649,7 @@
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -638,8 +657,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -690,21 +709,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -721,7 +743,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -729,7 +751,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -738,7 +760,7 @@
+ test -z "$(kjavadatadir)" || $(mkdir_p) "$(DESTDIR)$(kjavadatadir)"
+ @list='$(kjavadata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kjavadataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kjavadatadir)/$$f'"; \
+ $(kjavadataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kjavadatadir)/$$f"; \
+ done
+@@ -746,7 +768,7 @@
+ uninstall-kjavadataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kjavadata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kjavadatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kjavadatadir)/$$f"; \
+ done
+@@ -758,13 +780,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -776,7 +792,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -784,13 +800,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -811,7 +821,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -910,17 +920,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -952,7 +960,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1070,13 +1078,6 @@
mocs: kjavaapplet.moc
#>+ 3
@@ -18040,7 +40471,7 @@
kjavaappletserver.moc: $(srcdir)/kjavaappletserver.h
$(MOC) $(srcdir)/kjavaappletserver.h -o kjavaappletserver.moc
-@@ -1084,11 +1080,11 @@
+@@ -1084,11 +1085,11 @@
mocs: kjavaappletserver.moc
#>+ 3
@@ -18055,7 +40486,7 @@
#>+ 3
kjavaprocess.moc: $(srcdir)/kjavaprocess.h
-@@ -1098,6 +1094,13 @@
+@@ -1098,6 +1099,13 @@
mocs: kjavaprocess.moc
#>+ 3
@@ -18069,7 +40500,7 @@
kjavaappletviewer.moc: $(srcdir)/kjavaappletviewer.h
$(MOC) $(srcdir)/kjavaappletviewer.h -o kjavaappletviewer.moc
-@@ -1115,7 +1118,7 @@
+@@ -1115,7 +1123,7 @@
#>+ 3
clean-metasources:
@@ -18078,7 +40509,7 @@
#>+ 2
KDE_DIST=KJAS_GRAMMAR.txt kjava.jar pluginsinfo Makefile.in kjava.policy.in configure.in.in kjavadownloader.h kxeventutil.cpp make-jar kqeventutil.cpp build.xml kjavaappletviewer.desktop build.properties Makefile.am cr16-action-java.png
-@@ -1174,7 +1177,7 @@
+@@ -1174,7 +1182,7 @@
#>+ 11
@@ -18087,7 +40518,7 @@
@echo 'creating kjavaappletviewer_la.all_cpp.cpp ...'; \
rm -f kjavaappletviewer_la.all_cpp.files kjavaappletviewer_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kjavaappletviewer_la.all_cpp.final; \
-@@ -1186,7 +1189,7 @@
+@@ -1186,7 +1194,7 @@
rm -f kjavaappletviewer_la.all_cpp.final kjavaappletviewer_la.all_cpp.files
#>+ 11
@@ -18096,7 +40527,7 @@
@echo 'creating libkjava_la.all_cpp.cpp ...'; \
rm -f libkjava_la.all_cpp.files libkjava_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkjava_la.all_cpp.final; \
-@@ -1226,8 +1229,8 @@
+@@ -1226,8 +1234,8 @@
kjavaappletcontext.lo: kjavaappletcontext.moc
kjavaprocess.o: kjavaprocess.moc
kjavaappletserver.o: kjavaappletserver.moc
@@ -18108,7 +40539,101 @@
nmcheck:
--- khtml/java/dummy/Makefile.in
+++ khtml/java/dummy/Makefile.in
-@@ -262,6 +262,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(libkjava_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -52,12 +54,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -69,24 +65,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dummy.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkjava_la_SOURCES)
+ DIST_SOURCES = $(libkjava_la_SOURCES)
+ ETAGS = etags
+@@ -106,6 +105,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -147,8 +148,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -225,7 +224,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -262,6 +260,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18118,7 +40643,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -317,6 +318,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -326,8 +328,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -345,6 +345,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -510,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18127,7 +40677,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -548,16 +549,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18139,9 +40689,146 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -565,8 +566,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -594,21 +595,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -722,7 +726,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- khtml/java/tests/Makefile.in
+++ khtml/java/tests/Makefile.in
-@@ -253,6 +253,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(testserver_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -60,24 +62,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/testkjavaappletserver.Po
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/testkjavaappletserver.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(testserver_SOURCES)
+ DIST_SOURCES = $(testserver_SOURCES)
+ ETAGS = etags
+@@ -97,6 +102,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -138,8 +145,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -216,7 +221,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -253,6 +257,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18151,7 +40838,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -308,6 +315,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -317,8 +325,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -336,6 +342,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -504,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18160,7 +40872,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -542,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18172,9 +40884,143 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -569,21 +576,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -695,7 +705,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- khtml/kmultipart/Makefile.in
+++ khtml/kmultipart/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkmultipart_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kde_servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -71,24 +66,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kmultipart.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kmultipart.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkmultipart_la_SOURCES)
+ DIST_SOURCES = $(libkmultipart_la_SOURCES)
+ kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -110,6 +108,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -151,8 +151,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -229,7 +227,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -266,6 +263,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18184,7 +41030,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -321,6 +321,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -330,8 +331,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -349,6 +348,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -526,7 +526,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18193,7 +41064,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -564,16 +564,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18205,9 +41076,177 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -581,8 +581,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -613,21 +613,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -644,7 +647,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -652,7 +655,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -758,7 +761,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- khtml/misc/Makefile.in
+++ khtml/misc/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(libkhtmlmisc_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -88,24 +90,40 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/arena.Plo ./$(DEPDIR)/decoder.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/guess_ja.Plo ./$(DEPDIR)/helper.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/htmlhashes.Plo ./$(DEPDIR)/loader.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/loader_jpeg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/stringit.Plo
++#>+ 10
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmlmisc_la.all_cpp.P ./$(DEPDIR)/arena.Plo ./$(DEPDIR)/decoder.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/guess_ja.Plo ./$(DEPDIR)/helper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmlhashes.Plo ./$(DEPDIR)/loader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/loader_jpeg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/stringit.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/arena.Plo ./$(DEPDIR)/decoder.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/guess_ja.Plo ./$(DEPDIR)/helper.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/htmlhashes.Plo ./$(DEPDIR)/loader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/loader_jpeg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/stringit.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlmisc_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlmisc_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -126,6 +144,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -167,8 +187,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -245,7 +263,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -282,6 +299,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18217,7 +41256,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -337,6 +357,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -346,8 +367,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -365,6 +384,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -544,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18226,7 +41290,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18238,9 +41302,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -617,21 +637,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -742,7 +765,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- khtml/pics/Makefile.in
+++ khtml/pics/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -68,6 +68,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -109,8 +111,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -187,7 +187,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -224,6 +223,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18250,7 +41389,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
+@@ -279,6 +281,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -288,8 +291,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -307,6 +308,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -480,7 +482,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -18259,7 +41423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +521,9 @@
+@@ -518,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18271,7 +41435,16 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -672,41 +675,41 @@
+@@ -589,7 +591,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -672,41 +674,41 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions
$(INSTALL_DATA) $(srcdir)/cr16-action-wallet_open.png $(DESTDIR)$(khtmliconsdir)/crystalsvg/16x16/actions/wallet_open.png
@@ -18331,7 +41504,164 @@
force-reedit:
--- khtml/rendering/Makefile.in
+++ khtml/rendering/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(libkhtmlrender_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -101,24 +103,103 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/bidi.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/break_lines.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/counter_tree.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/enumerate.Plo ./$(DEPDIR)/font.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_arena.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_block.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_body.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_box.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_br.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_canvas.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_container.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_flow.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_form.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_frames.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_generated.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_image.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_inline.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_layer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_line.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_list.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_replaced.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_style.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_table.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/render_text.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/table_layout.Plo
++#>+ 52
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmlrender_la.all_cpp.P ./$(DEPDIR)/bidi.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/break_lines.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/counter_tree.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/enumerate.Plo ./$(DEPDIR)/font.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_arena.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_block.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_body.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_box.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_br.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_canvas.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_container.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_flow.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_form.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_frames.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_generated.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_image.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_inline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_layer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_line.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_list.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_replaced.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_style.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_table.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_text.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/table_layout.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/bidi.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/break_lines.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/counter_tree.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/enumerate.Plo ./$(DEPDIR)/font.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_arena.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_block.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_body.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_box.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_br.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_canvas.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_container.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_flow.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_form.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_frames.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_generated.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_image.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_inline.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_layer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_line.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_list.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_replaced.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_style.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_table.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/render_text.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/table_layout.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlrender_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlrender_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -139,6 +220,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -180,8 +263,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -258,7 +339,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -295,6 +375,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18341,7 +41671,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -350,6 +433,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -359,8 +443,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -378,6 +460,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -566,7 +649,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18350,7 +41705,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -604,9 +687,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18362,7 +41717,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -868,18 +871,18 @@
+@@ -658,21 +741,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -783,7 +869,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -868,18 +954,18 @@
.NOEXPORT:
#>+ 3
@@ -18387,7 +41779,7 @@
#>+ 3
render_frames.moc: $(srcdir)/render_frames.h
-@@ -897,7 +900,7 @@
+@@ -897,7 +983,7 @@
#>+ 3
clean-metasources:
@@ -18396,7 +41788,7 @@
#>+ 2
KDE_DIST=render_inline.h render_block.h img-loading.png table_layout.txt Makefile.in counter_tree.h render_applet.cpp render_body.h render_image.h loading_icon.cpp Makefile.am
-@@ -944,7 +947,7 @@
+@@ -944,7 +1030,7 @@
#>+ 11
@@ -18405,7 +41797,7 @@
@echo 'creating libkhtmlrender_la.all_cpp.cpp ...'; \
rm -f libkhtmlrender_la.all_cpp.files libkhtmlrender_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkhtmlrender_la.all_cpp.final; \
-@@ -986,7 +989,7 @@
+@@ -986,7 +1072,7 @@
render_replaced.o: render_replaced.moc
nmcheck-am: nmcheck
render_replaced.lo: render_replaced.moc
@@ -18416,7 +41808,119 @@
render_layer.lo: render_layer.moc
--- khtml/xml/Makefile.in
+++ khtml/xml/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(libkhtmlxml_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -91,24 +93,58 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dom2_eventsimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_rangeimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversalimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom2_viewsimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_docimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_elementimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_nodeimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_stringimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_textimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dom_xmlimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/xml_tokenizer.Plo
++#>+ 22
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkhtmlxml_la.all_cpp.P ./$(DEPDIR)/dom2_eventsimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_rangeimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversalimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_viewsimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_docimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_elementimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_nodeimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_stringimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_textimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_xmlimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xml_tokenizer.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/dom2_eventsimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_rangeimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_traversalimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom2_viewsimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_docimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_elementimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_nodeimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_stringimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_textimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dom_xmlimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/xml_tokenizer.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkhtmlxml_la_SOURCES)
+ DIST_SOURCES = $(libkhtmlxml_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -129,6 +165,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -170,8 +208,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -248,7 +284,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -285,6 +320,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18426,7 +41930,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -552,7 +555,7 @@
+@@ -340,6 +378,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -349,8 +388,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -368,6 +405,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -552,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18435,7 +41964,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -590,9 +593,9 @@
+@@ -590,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18447,9 +41976,182 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -628,21 +666,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -753,7 +794,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kimgio/Makefile.in
+++ kimgio/Makefile.in
-@@ -352,6 +352,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kimg_dds_la_SOURCES) $(kimg_eps_la_SOURCES) $(kimg_exr_la_SOURCES) $(kimg_hdr_la_SOURCES) $(kimg_ico_la_SOURCES) $(kimg_jp2_la_SOURCES) $(kimg_pcx_la_SOURCES) $(kimg_psd_la_SOURCES) $(kimg_rgb_la_SOURCES) $(kimg_tga_la_SOURCES) $(kimg_tiff_la_SOURCES) $(kimg_xcf_la_SOURCES) $(kimg_xview_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -56,14 +58,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -83,8 +78,6 @@
+ #>- kimg_exr_la_OBJECTS = $(am_kimg_exr_la_OBJECTS)
+ #>+ 1
+ kimg_exr_la_OBJECTS = exr.lo
+- at include_EXR_MODULES_TRUE@am_kimg_exr_la_rpath = -rpath \
+- at include_EXR_MODULES_TRUE@ $(kde_moduledir)
+ kimg_hdr_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_kimg_hdr_la_OBJECTS = hdr.lo
+ #>- kimg_hdr_la_OBJECTS = $(am_kimg_hdr_la_OBJECTS)
+@@ -101,8 +94,6 @@
+ #>- kimg_jp2_la_OBJECTS = $(am_kimg_jp2_la_OBJECTS)
+ #>+ 1
+ kimg_jp2_la_OBJECTS = jp2.lo
+- at include_JP2_MODULES_TRUE@am_kimg_jp2_la_rpath = -rpath \
+- at include_JP2_MODULES_TRUE@ $(kde_moduledir)
+ kimg_pcx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_kimg_pcx_la_OBJECTS = pcx.lo
+ #>- kimg_pcx_la_OBJECTS = $(am_kimg_pcx_la_OBJECTS)
+@@ -129,8 +120,6 @@
+ #>- kimg_tiff_la_OBJECTS = $(am_kimg_tiff_la_OBJECTS)
+ #>+ 1
+ kimg_tiff_la_OBJECTS = tiffr.lo
+- at include_TIFF_MODULES_TRUE@am_kimg_tiff_la_rpath = -rpath \
+- at include_TIFF_MODULES_TRUE@ $(kde_moduledir)
+ kimg_xcf_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_kimg_xcf_la_OBJECTS = xcf.lo
+ #>- kimg_xcf_la_OBJECTS = $(am_kimg_xcf_la_OBJECTS)
+@@ -144,24 +133,39 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dds.Plo ./$(DEPDIR)/eps.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/exr.Plo ./$(DEPDIR)/hdr.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ico.Plo ./$(DEPDIR)/jp2.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/pcx.Plo ./$(DEPDIR)/psd.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/rgb.Plo ./$(DEPDIR)/tga.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/tiffr.Plo ./$(DEPDIR)/xcf.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/xview.Plo
++#>+ 7
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dds.Plo ./$(DEPDIR)/eps.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/exr.Plo ./$(DEPDIR)/hdr.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ico.Plo ./$(DEPDIR)/jp2.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pcx.Plo ./$(DEPDIR)/psd.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/rgb.Plo ./$(DEPDIR)/tga.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tiffr.Plo ./$(DEPDIR)/xcf.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/xview.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kimg_dds_la_SOURCES) $(kimg_eps_la_SOURCES) \
+ $(kimg_exr_la_SOURCES) $(kimg_hdr_la_SOURCES) \
+ $(kimg_ico_la_SOURCES) $(kimg_jp2_la_SOURCES) \
+@@ -196,6 +200,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -237,8 +243,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -315,7 +319,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -352,6 +355,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18459,7 +42161,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -688,7 +691,7 @@
+@@ -407,6 +413,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -416,8 +423,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -435,6 +440,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -688,7 +694,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18468,7 +42195,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -726,9 +729,9 @@
+@@ -726,16 +732,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18480,9 +42207,256 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -743,8 +749,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -771,7 +777,7 @@
+ #>+ 2
+ @KDE_USE_CLOSURE_TRUE at kimg_exr.la: kimg_exr.la.closure $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES)
+ @KDE_USE_CLOSURE_FALSE at kimg_exr.la: $(kimg_exr_la_OBJECTS) $(kimg_exr_la_DEPENDENCIES)
+- $(CXXLINK) $(am_kimg_exr_la_rpath) $(kimg_exr_la_LDFLAGS) $(kimg_exr_la_OBJECTS) $(kimg_exr_la_LIBADD) $(LIBS)
++ $(CXXLINK) -rpath $(kde_moduledir) $(kimg_exr_la_LDFLAGS) $(kimg_exr_la_OBJECTS) $(kimg_exr_la_LIBADD) $(LIBS)
+ #>- kimg_hdr.la: $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES)
+ #>+ 2
+ @KDE_USE_CLOSURE_TRUE at kimg_hdr.la: kimg_hdr.la.closure $(kimg_hdr_la_OBJECTS) $(kimg_hdr_la_DEPENDENCIES)
+@@ -786,7 +792,7 @@
+ #>+ 2
+ @KDE_USE_CLOSURE_TRUE at kimg_jp2.la: kimg_jp2.la.closure $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES)
+ @KDE_USE_CLOSURE_FALSE at kimg_jp2.la: $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_DEPENDENCIES)
+- $(CXXLINK) $(am_kimg_jp2_la_rpath) $(kimg_jp2_la_LDFLAGS) $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_LIBADD) $(LIBS)
++ $(CXXLINK) -rpath $(kde_moduledir) $(kimg_jp2_la_LDFLAGS) $(kimg_jp2_la_OBJECTS) $(kimg_jp2_la_LIBADD) $(LIBS)
+ #>- kimg_pcx.la: $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES)
+ #>+ 2
+ @KDE_USE_CLOSURE_TRUE at kimg_pcx.la: kimg_pcx.la.closure $(kimg_pcx_la_OBJECTS) $(kimg_pcx_la_DEPENDENCIES)
+@@ -811,7 +817,7 @@
+ #>+ 2
+ @KDE_USE_CLOSURE_TRUE at kimg_tiff.la: kimg_tiff.la.closure $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES)
+ @KDE_USE_CLOSURE_FALSE at kimg_tiff.la: $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_DEPENDENCIES)
+- $(CXXLINK) $(am_kimg_tiff_la_rpath) $(kimg_tiff_la_LDFLAGS) $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_LIBADD) $(LIBS)
++ $(CXXLINK) -rpath $(kde_moduledir) $(kimg_tiff_la_LDFLAGS) $(kimg_tiff_la_OBJECTS) $(kimg_tiff_la_LIBADD) $(LIBS)
+ #>- kimg_xcf.la: $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES)
+ #>+ 2
+ @KDE_USE_CLOSURE_TRUE at kimg_xcf.la: kimg_xcf.la.closure $(kimg_xcf_la_OBJECTS) $(kimg_xcf_la_DEPENDENCIES)
+@@ -847,21 +853,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -878,7 +887,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -886,7 +895,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -993,7 +1002,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kinit/Makefile.in
+++ kinit/Makefile.in
-@@ -389,6 +389,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,6 +34,10 @@
+
+
+
++#>- SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) $(kdostartupconfig_SOURCES) $(kioslave_SOURCES) $(kshell_SOURCES) $(kstartupconfig_SOURCES) $(kwrapper_SOURCES) $(lnusertemp_SOURCES)
++#>+ 1
++SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) $(kdostartupconfig_SOURCES) $(kioslave_SOURCES) $(kshell_SOURCES) $(kstartupconfig_SOURCES) $(kwrapper_SOURCES) $(lnusertemp_SOURCES) $(klauncher_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -76,14 +80,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)"
++am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -153,43 +150,65 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/autostart.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdostartupconfig.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klauncher.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klauncher_main.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstartupconfig.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/wrapper.Po
++#>+ 18
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/klauncher.la.Po $(DEPDIR)/klauncher_dummy.Plo $(DEPDIR)/libkdeinit_klauncher_la.all_cpp.P $(DEPDIR)/klauncher_la.all_cpp.P $(DEPDIR)/kdeinit.all_cpp.P ./$(DEPDIR)/autostart.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdostartupconfig.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher_main.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstartupconfig.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/wrapper.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/klauncher.la.Po $(DEPDIR)/klauncher_dummy.Plo ./$(DEPDIR)/autostart.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdostartupconfig.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher_main.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstartupconfig.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/wrapper.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) \
+-#>- $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) \
+-#>- $(kdostartupconfig_SOURCES) $(kioslave_SOURCES) \
+-#>- $(kshell_SOURCES) $(kstartupconfig_SOURCES) \
+-#>- $(kwrapper_SOURCES) $(lnusertemp_SOURCES)
+-#>+ 5
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) \
+ $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) \
+ $(kdostartupconfig_SOURCES) $(kioslave_SOURCES) \
+ $(kshell_SOURCES) $(kstartupconfig_SOURCES) \
+- $(kwrapper_SOURCES) $(lnusertemp_SOURCES) $(klauncher_SOURCES)
++ $(kwrapper_SOURCES) $(lnusertemp_SOURCES)
+ #>- DIST_SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) \
+ #>- $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) \
+ #>- $(kdostartupconfig_SOURCES) $(kioslave_SOURCES) \
+@@ -233,6 +252,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -274,8 +295,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -352,7 +371,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -389,6 +407,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18492,7 +42466,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -679,7 +682,7 @@
+@@ -444,6 +465,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -453,8 +475,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -472,6 +492,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -679,7 +700,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -18501,7 +42500,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -717,9 +720,9 @@
+@@ -717,16 +738,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18513,9 +42512,263 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -734,8 +755,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -753,7 +774,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -761,8 +782,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -856,42 +877,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -911,13 +938,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -929,7 +950,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -937,13 +958,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -964,7 +979,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1064,17 +1079,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1108,7 +1121,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kinit/tests/Makefile.in
+++ kinit/tests/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+ # $Id: Makefile.am 157691 2002-05-25 18:00:11Z coolo $
++SOURCES = $(klaunchertest_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -63,24 +65,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/klaunchertest.Po
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/klaunchertest.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(klaunchertest_SOURCES)
+ DIST_SOURCES = $(klaunchertest_SOURCES)
+ ETAGS = etags
+@@ -100,6 +105,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -141,8 +148,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -219,7 +224,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -256,6 +260,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18525,7 +42778,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -311,6 +318,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -320,8 +328,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -339,6 +345,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -504,7 +511,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18534,7 +42812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -542,9 +549,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18546,9 +42824,145 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -569,21 +576,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -695,7 +705,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/Makefile.in
+++ kio/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+
+
+
++SOURCES = $(libkio_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -73,16 +75,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(updatedir)" \
+- "$(DESTDIR)$(dataprotocoldir)" "$(DESTDIR)$(kde_mimedir)" \
+- "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(kdeddir)" \
+- "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(updatedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(dataprotocoldir)" "$(DESTDIR)$(kde_mimedir)" "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(kdeddir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(updatedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -101,24 +94,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dummy.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkio_la_SOURCES)
+ DIST_SOURCES = $(libkio_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -160,6 +156,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -201,8 +199,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -279,7 +275,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -316,6 +311,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18558,7 +42972,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -371,6 +369,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,8 +379,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -399,6 +396,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -595,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18567,7 +43006,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,16 +631,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18579,9 +43018,369 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -650,8 +648,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -701,21 +699,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -732,7 +733,7 @@
+ test -z "$(dataprotocoldir)" || $(mkdir_p) "$(DESTDIR)$(dataprotocoldir)"
+ @list='$(dataprotocol_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(dataprotocolDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dataprotocoldir)/$$f'"; \
+ $(dataprotocolDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dataprotocoldir)/$$f"; \
+ done
+@@ -740,7 +741,7 @@
+ uninstall-dataprotocolDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dataprotocol_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(dataprotocoldir)/$$f'"; \
+ rm -f "$(DESTDIR)$(dataprotocoldir)/$$f"; \
+ done
+@@ -749,7 +750,7 @@
+ test -z "$(kde_mimedir)" || $(mkdir_p) "$(DESTDIR)$(kde_mimedir)"
+ @list='$(kde_mime_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_mimeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_mimedir)/$$f'"; \
+ $(kde_mimeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_mimedir)/$$f"; \
+ done
+@@ -757,7 +758,7 @@
+ uninstall-kde_mimeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_mime_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_mimedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_mimedir)/$$f"; \
+ done
+@@ -766,7 +767,7 @@
+ test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
+ @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicetypesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
+ $(kde_servicetypesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
+ done
+@@ -774,7 +775,7 @@
+ uninstall-kde_servicetypesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
+ done
+@@ -783,7 +784,7 @@
+ test -z "$(kdeddir)" || $(mkdir_p) "$(DESTDIR)$(kdeddir)"
+ @list='$(kded_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdedDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeddir)/$$f'"; \
+ $(kdedDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeddir)/$$f"; \
+ done
+@@ -791,7 +792,7 @@
+ uninstall-kdedDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kded_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdeddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdeddir)/$$f"; \
+ done
+@@ -800,7 +801,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -808,7 +809,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -817,7 +818,7 @@
+ test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+ @list='$(update_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
+ $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+@@ -825,7 +826,7 @@
+ uninstall-updateDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(update_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+@@ -837,13 +838,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -855,7 +850,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -863,13 +858,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -890,7 +879,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -990,17 +979,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1032,7 +1019,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/bookmarks/Makefile.in
+++ kio/bookmarks/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,6 +34,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(libkbookmarks_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -94,32 +96,66 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kbookmark.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkbar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdombuilder.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdrag.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkexporter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_crash.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ie.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_kde1.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ns.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_opera.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmenu.Plo
++#>+ 26
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kbookmarkmanager_skel.P $(DEPDIR)/kbookmarknotifier_skel.P $(DEPDIR)/libkbookmarks_la.all_cc.P ./$(DEPDIR)/kbookmark.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdombuilder.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdrag.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkexporter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_crash.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ie.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_kde1.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ns.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_opera.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmenu.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kbookmarkmanager_skel.P $(DEPDIR)/kbookmarknotifier_skel.P ./$(DEPDIR)/kbookmark.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdombuilder.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkdrag.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkexporter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_crash.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ie.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_kde1.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_ns.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkimporter_opera.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkmenu.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkbookmarks_la_SOURCES)
+ DIST_SOURCES = $(libkbookmarks_la_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(includedir)"
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS)
+@@ -140,6 +176,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -181,8 +219,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -259,7 +295,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -296,6 +331,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18591,7 +43390,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -351,6 +389,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,8 +399,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -379,6 +416,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -566,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -18600,7 +43424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -604,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18612,9 +43436,145 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -644,21 +682,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -675,7 +716,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -683,7 +724,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -790,7 +831,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/httpfilter/Makefile.in
+++ kio/httpfilter/Makefile.in
-@@ -256,6 +256,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(libhttpfilter_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -63,24 +65,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/httpfilter.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/httpfilter.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libhttpfilter_la_SOURCES)
+ DIST_SOURCES = $(libhttpfilter_la_SOURCES)
+ ETAGS = etags
+@@ -100,6 +105,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -141,8 +148,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -219,7 +224,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -256,6 +260,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18624,7 +43584,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,7 @@
+@@ -311,6 +318,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -320,8 +328,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -339,6 +345,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -507,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -18633,7 +43618,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +548,9 @@
+@@ -545,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18645,9 +43630,244 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -573,21 +580,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -699,7 +709,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/kfile/Makefile.in
+++ kio/kfile/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+
+
+
++SOURCES = $(libkfile_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -108,34 +110,136 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kacleditwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcombiview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcustommenueditor.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdiroperator.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirsize.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdiskfreesp.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kencodingfiledialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilebookmarkhandler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiledetailview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiledialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilefiltercombo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfileiconview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfowidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetapreview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilepreview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilesharedlg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilespeedbar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreebranch.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewitem.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfileview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kicondialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kimagefilepreview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmetaprops.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotifydialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kopenwith.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewprops.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewwidgetbase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpropertiesdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krecentdirs.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krecentdocument.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlbar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlcombobox.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequester.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequesterdlg.Plo
++#>+ 72
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/knotifywidgetbase.P $(DEPDIR)/kpropertiesdesktopbase.P $(DEPDIR)/kpropertiesdesktopadvbase.P $(DEPDIR)/kpropertiesmimetypebase.P $(DEPDIR)/libkfile_la.all_cpp.P ./$(DEPDIR)/kacleditwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcombiview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcustommenueditor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiroperator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirsize.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiskfreesp.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kencodingfiledialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilebookmarkhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiledetailview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiledialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilefiltercombo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileiconview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfowidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetapreview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilepreview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilesharedlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilespeedbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreebranch.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewitem.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicondialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimagefilepreview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmetaprops.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifydialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kopenwith.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewprops.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewwidgetbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpropertiesdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krecentdirs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krecentdocument.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlcombobox.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequester.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequesterdlg.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/knotifywidgetbase.P $(DEPDIR)/kpropertiesdesktopbase.P $(DEPDIR)/kpropertiesdesktopadvbase.P $(DEPDIR)/kpropertiesmimetypebase.P ./$(DEPDIR)/kacleditwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcombiview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcustommenueditor.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiroperator.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirsize.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiskfreesp.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kencodingfiledialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilebookmarkhandler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiledetailview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiledialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilefiltercombo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileiconview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfowidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetapreview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilepreview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilesharedlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilespeedbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreebranch.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewitem.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicondialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimagefilepreview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmetaprops.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifydialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kopenwith.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewprops.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpreviewwidgetbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpropertiesdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krecentdirs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krecentdocument.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlcombobox.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequester.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequesterdlg.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkfile_la_SOURCES)
+ DIST_SOURCES = $(libkfile_la_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(servicetypedir)" \
+- "$(DESTDIR)$(includedir)"
++am__installdirs = "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(includedir)"
+ servicetypeDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(servicetype_DATA)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -157,6 +261,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -198,8 +304,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -276,7 +380,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -313,6 +416,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18657,7 +43877,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -620,7 +623,7 @@
+@@ -368,6 +474,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -377,8 +484,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -396,6 +501,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -620,7 +726,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18666,7 +43911,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -658,9 +661,9 @@
+@@ -658,9 +764,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18678,7 +43923,80 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -1093,18 +1096,18 @@
+@@ -721,21 +827,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -752,7 +861,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -760,7 +869,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -769,7 +878,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -777,7 +886,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -884,7 +993,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1093,18 +1202,18 @@
mocs: kimagefilepreview.moc
#>+ 3
@@ -18703,7 +44021,7 @@
#>+ 3
kacleditwidget.moc: $(srcdir)/kacleditwidget.h
-@@ -1163,18 +1166,18 @@
+@@ -1163,18 +1272,18 @@
mocs: kfilefiltercombo.moc
#>+ 3
@@ -18728,7 +44046,7 @@
#>+ 3
kfiledialog.moc: $(srcdir)/kfiledialog.h
-@@ -1198,18 +1201,18 @@
+@@ -1198,18 +1307,18 @@
mocs: kfiledetailview.moc
#>+ 3
@@ -18753,7 +44071,7 @@
#>+ 3
kfilebookmarkhandler.moc: $(srcdir)/kfilebookmarkhandler.h
-@@ -1311,7 +1314,7 @@
+@@ -1311,7 +1420,7 @@
#>+ 3
clean-metasources:
@@ -18762,7 +44080,7 @@
#>+ 2
KDE_DIST=Makefile.in kpropsdlgplugin.desktop kpropertiesmimetypebase.ui kpropertiesdesktopbase.ui kpropertiesdesktopadvbase.ui kfilemetapreview.h knotifywidgetbase.ui Makefile.am
-@@ -1366,7 +1369,7 @@
+@@ -1366,7 +1475,7 @@
#>+ 11
@@ -18773,7 +44091,113 @@
echo "#define KDE_USE_FINAL 1" >> libkfile_la.all_cpp.final; \
--- kio/kfile/tests/Makefile.in
+++ kio/kfile/tests/Makefile.in
-@@ -330,6 +330,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -33,6 +33,8 @@
+ # along with this library; see the file COPYING.LIB. If not, write to
+ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ # Boston, MA 02110-1301, USA.
++SOURCES = $(kcustommenueditortest_SOURCES) $(kdirselectdialogtest_SOURCES) $(kfiletreeviewtest_SOURCES) $(kfstest_SOURCES) $(kicondialogtest_SOURCES) $(knotifytest_SOURCES) $(kopenwithtest_SOURCES) $(kurlrequestertest_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -129,24 +131,52 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcustommenueditortest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialogtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfdtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfstest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kicondialogtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kopenwithtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequestertest.Po
++#>+ 18
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kfstest.all_cpp.P ./$(DEPDIR)/kcustommenueditortest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialogtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfdtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfstest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicondialogtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kopenwithtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequestertest.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kcustommenueditortest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirselectdialogtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfdtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiletreeviewtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfstest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicondialogtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kopenwithtest.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlrequestertest.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcustommenueditortest_SOURCES) \
+ $(kdirselectdialogtest_SOURCES) $(kfiletreeviewtest_SOURCES) \
+ $(kfstest_SOURCES) $(kicondialogtest_SOURCES) \
+@@ -174,6 +204,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -215,8 +247,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -293,7 +323,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -330,6 +359,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18783,7 +44207,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -385,6 +417,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -394,8 +427,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -413,6 +444,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -589,7 +621,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18792,7 +44241,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -627,9 +659,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18804,9 +44253,338 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -683,21 +715,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -809,7 +844,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/kio/Makefile.in
+++ kio/kio/Makefile.in
-@@ -343,6 +343,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,6 +34,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -131,42 +133,228 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/authinfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/chmodjob.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/connection.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dataprotocol.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dataslave.Plo ./$(DEPDIR)/davjob.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/defaultprogress.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/forwardingslavebase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/job.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kacl.Plo ./$(DEPDIR)/kar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/karchive.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kautomount.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdatatool.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdcopservicestarter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirlister.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify_stub.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirwatch.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kemailsettings.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilefilter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfileitem.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfileshare.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilterbase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfilterdev.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kimageio.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimemagic.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimetype.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimetypechooser.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knfsshare.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolmanager.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kremoteencoding.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/krun.Plo ./$(DEPDIR)/ksambashare.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kscan.Plo ./$(DEPDIR)/kservice.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kservicefactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroup.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroupfactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kservicetype.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kservicetypefactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshellcompletion.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshred.Plo ./$(DEPDIR)/ktar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktrader.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparse.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparsetree.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurifilter.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlcompletion.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlpixmapprovider.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kuserprofile.Plo ./$(DEPDIR)/kzip.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/lex.Plo ./$(DEPDIR)/metainfojob.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/netaccess.Plo ./$(DEPDIR)/observer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/passdlg.Plo ./$(DEPDIR)/paste.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/pastedialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/posixacladdons.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/previewjob.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/progressbase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/renamedlg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/scheduler.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/sessiondata.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/skipdlg.Plo ./$(DEPDIR)/slave.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/slavebase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/slaveconfig.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/slaveinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/statusbarprogress.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/tcpslavebase.Plo ./$(DEPDIR)/yacc.Plo
++#>+ 128
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/observer_stub.P $(DEPDIR)/kdirnotify_skel.P $(DEPDIR)/uiserver_stub.P $(DEPDIR)/observer_skel.P $(DEPDIR)/libkiocore_la.all_cpp.P $(DEPDIR)/libksycoca_la.all_cpp.P ./$(DEPDIR)/authinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/chmodjob.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/connection.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dataprotocol.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dataslave.Plo ./$(DEPDIR)/davjob.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultprogress.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/forwardingslavebase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/job.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kacl.Plo ./$(DEPDIR)/kar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/karchive.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kautomount.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatatool.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcopservicestarter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirlister.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify_stub.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirwatch.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kemailsettings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilefilter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileitem.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileshare.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilterbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilterdev.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimageio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimemagic.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimetype.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimetypechooser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knfsshare.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kremoteencoding.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/krun.Plo ./$(DEPDIR)/ksambashare.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kscan.Plo ./$(DEPDIR)/kservice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroup.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroupfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicetype.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicetypefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshellcompletion.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshred.Plo ./$(DEPDIR)/ktar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktrader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparse.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparsetree.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurifilter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlcompletion.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlpixmapprovider.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuserprofile.Plo ./$(DEPDIR)/kzip.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lex.Plo ./$(DEPDIR)/metainfojob.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/netaccess.Plo ./$(DEPDIR)/observer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/passdlg.Plo ./$(DEPDIR)/paste.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pastedialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/posixacladdons.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/previewjob.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/progressbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/renamedlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/scheduler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sessiondata.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/skipdlg.Plo ./$(DEPDIR)/slave.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slavebase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slaveconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/slaveinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/statusbarprogress.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tcpslavebase.Plo ./$(DEPDIR)/yacc.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/observer_stub.P $(DEPDIR)/kdirnotify_skel.P $(DEPDIR)/uiserver_stub.P $(DEPDIR)/observer_skel.P ./$(DEPDIR)/authinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/chmodjob.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/connection.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dataprotocol.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dataslave.Plo ./$(DEPDIR)/davjob.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultprogress.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/forwardingslavebase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/job.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kacl.Plo ./$(DEPDIR)/kar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/karchive.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kautomount.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdatatool.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdcopservicestarter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirlister.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirnotify_stub.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirwatch.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kemailsettings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilefilter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileitem.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilemetainfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfileshare.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilterbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfilterdev.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kimageio.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimemagic.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimetype.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimetypechooser.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knfsshare.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolmanager.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kremoteencoding.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/krun.Plo ./$(DEPDIR)/ksambashare.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kscan.Plo ./$(DEPDIR)/kservice.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroup.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicegroupfactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicetype.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kservicetypefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshellcompletion.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshred.Plo ./$(DEPDIR)/ktar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktrader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparse.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktraderparsetree.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurifilter.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlcompletion.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlpixmapprovider.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kuserprofile.Plo ./$(DEPDIR)/kzip.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lex.Plo ./$(DEPDIR)/metainfojob.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/netaccess.Plo ./$(DEPDIR)/observer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/passdlg.Plo ./$(DEPDIR)/paste.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/pastedialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/posixacladdons.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/previewjob.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/progressbase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/renamedlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/scheduler.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/sessiondata.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/skipdlg.Plo ./$(DEPDIR)/slave.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slavebase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slaveconfig.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/slaveinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/statusbarprogress.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tcpslavebase.Plo ./$(DEPDIR)/yacc.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
+ DIST_SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(includedir)" \
+- "$(DESTDIR)$(kioincludedir)"
++am__installdirs = "$(DESTDIR)$(includedir)" "$(DESTDIR)$(kioincludedir)"
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ kioincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS) $(kioinclude_HEADERS) $(noinst_HEADERS)
+@@ -187,6 +375,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -228,8 +418,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -306,7 +494,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -343,6 +530,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -18816,8 +44594,115 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -693,7 +696,7 @@
+@@ -398,6 +588,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -407,8 +598,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -426,6 +615,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -588,32 +778,40 @@
+ # convenience lib - no LDFLAGS or LIBADD !
+ #if USE_POSIX_ACL
+-libksycoca_la_SOURCES = kdirwatch.cpp kfileshare.cpp ksambashare.cpp \
+- knfsshare.cpp ktrader.cpp ktraderparse.cpp \
+- ktraderparsetree.cpp kservicetypefactory.cpp kservicetype.cpp \
+- kmimetype.cpp kservicegroup.cpp kservice.cpp \
+- kservicefactory.cpp kuserprofile.cpp kservicegroupfactory.cpp \
+- kurifilter.cpp kfilterbase.cpp kfilterdev.cpp \
+- kshellcompletion.cpp kurlcompletion.cpp kautomount.cpp \
+- krun.cpp kfileitem.cpp kdirlister.cpp kimageio.cpp yacc.c \
+- lex.c chmodjob.cpp kscan.cpp kar.cpp ktar.cpp kzip.cpp \
+- previewjob.cpp metainfojob.cpp davjob.cpp kdatatool.cpp \
+- karchive.cpp kfilefilter.cpp kfilemetainfo.cpp \
+- kdcopservicestarter.cpp dataslave.cpp dataprotocol.cpp \
+- kacl.cpp posixacladdons.cpp
++libksycoca_la_SOURCES = \
++ kdirwatch.cpp \
++ kfileshare.cpp ksambashare.cpp knfsshare.cpp \
++ ktrader.cpp ktraderparse.cpp ktraderparsetree.cpp \
++ kservicetypefactory.cpp kservicetype.cpp \
++ kmimetype.cpp kservicegroup.cpp \
++ kservice.cpp kservicefactory.cpp \
++ kuserprofile.cpp kservicegroupfactory.cpp \
++ kurifilter.cpp \
++ kfilterbase.cpp kfilterdev.cpp \
++ kshellcompletion.cpp kurlcompletion.cpp \
++ kautomount.cpp krun.cpp \
++ kfileitem.cpp kdirlister.cpp kimageio.cpp \
++ yacc.c lex.c \
++ chmodjob.cpp kscan.cpp kar.cpp ktar.cpp kzip.cpp previewjob.cpp metainfojob.cpp davjob.cpp \
++ kdatatool.cpp karchive.cpp kfilefilter.cpp \
++ kfilemetainfo.cpp kdcopservicestarter.cpp \
++ dataslave.cpp dataprotocol.cpp \
++kacl.cpp posixacladdons.cpp
+ #endif
+ #if USE_POSIX_ACL
+-include_HEADERS = kservicetype.h kmimetype.h kmimemagic.h kservice.h \
+- krun.h kdirwatch.h kautomount.h kuserprofile.h kshred.h kar.h \
+- ktar.h kzip.h ktrader.h kurifilter.h kurlcompletion.h \
+- kshellcompletion.h kfileitem.h kfileshare.h ksambashare.h \
+- knfsshare.h kdirlister.h kservicegroup.h kimageio.h \
+- kdirnotify.h kdirnotify_stub.h kurlpixmapprovider.h \
+- kprotocolinfo.h kprotocolmanager.h kfilterbase.h kfilterdev.h \
+- kemailsettings.h kscan.h kdatatool.h karchive.h kfilefilter.h \
+- kfilemetainfo.h renamedlgplugin.h kmimetyperesolver.h \
+- kdcopservicestarter.h kremoteencoding.h kmimetypechooser.h \
+- kacl.h
++include_HEADERS = \
++ kservicetype.h kmimetype.h kmimemagic.h kservice.h \
++ krun.h kdirwatch.h kautomount.h kuserprofile.h \
++ kshred.h kar.h ktar.h kzip.h ktrader.h kurifilter.h kurlcompletion.h \
++ kshellcompletion.h kfileitem.h kfileshare.h ksambashare.h knfsshare.h \
++ kdirlister.h kservicegroup.h \
++ kimageio.h kdirnotify.h kdirnotify_stub.h \
++ kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h \
++ kfilterbase.h kfilterdev.h kemailsettings.h kscan.h kdatatool.h \
++ karchive.h kfilefilter.h kfilemetainfo.h renamedlgplugin.h \
++ kmimetyperesolver.h kdcopservicestarter.h kremoteencoding.h \
++ kmimetypechooser.h \
++kacl.h
+ #endif
+
+ #libkiocore_la_LDFLAGS = $(all_libraries)
+@@ -680,10 +878,12 @@
+ # Internal
+ #if USE_POSIX_ACL
+ noinst_HEADERS = kservicetypefactory.h kservicefactory.h \
+- kmessageboxwrapper.h ktraderparse.h ktraderparsetree.h yacc.h \
+- kimageiofactory.h kdirwatch_p.h kdirlister_p.h renamedlg.h \
+- skipdlg.h dataslave.h dataprotocol.h kservice_p.h \
+- posixacladdons.h
++ kmessageboxwrapper.h \
++ ktraderparse.h ktraderparsetree.h yacc.h \
++ kimageiofactory.h kdirwatch_p.h kdirlister_p.h \
++ renamedlg.h skipdlg.h dataslave.h dataprotocol.h \
++ kservice_p.h\
++posixacladdons.h
+ #endif
+ parserfiles = yacc.y lex.l
+ EXTRA_DIST = $(parserfiles)
+@@ -693,7 +893,7 @@
+
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../../admin/Doxyfile.am $(am__configure_deps)
@@ -18825,7 +44710,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -731,9 +734,9 @@
+@@ -731,9 +931,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18837,7 +44722,107 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -1266,13 +1269,6 @@
+@@ -836,42 +1036,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -888,7 +1094,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -896,7 +1102,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -905,7 +1111,7 @@
+ test -z "$(kioincludedir)" || $(mkdir_p) "$(DESTDIR)$(kioincludedir)"
+ @list='$(kioinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kioincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kioincludedir)/$$f'"; \
+ $(kioincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kioincludedir)/$$f"; \
+ done
+@@ -913,7 +1119,7 @@
+ uninstall-kioincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kioinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kioincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kioincludedir)/$$f"; \
+ done
+@@ -1020,7 +1226,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1266,13 +1472,6 @@
mocs: slave.moc
#>+ 3
@@ -18851,7 +44836,7 @@
kshred.moc: $(srcdir)/kshred.h
$(MOC) $(srcdir)/kshred.h -o kshred.moc
-@@ -1280,11 +1276,11 @@
+@@ -1280,11 +1479,11 @@
mocs: kshred.moc
#>+ 3
@@ -18866,7 +44851,7 @@
#>+ 3
kurifilter.moc: $(srcdir)/kurifilter.h
-@@ -1294,6 +1290,13 @@
+@@ -1294,6 +1493,13 @@
mocs: kurifilter.moc
#>+ 3
@@ -18880,7 +44865,7 @@
defaultprogress.moc: $(srcdir)/defaultprogress.h
$(MOC) $(srcdir)/defaultprogress.h -o defaultprogress.moc
-@@ -1406,18 +1409,18 @@
+@@ -1406,18 +1612,18 @@
mocs: slaveconfig.moc
#>+ 3
@@ -18905,7 +44890,7 @@
#>+ 3
kfilterbase.moc: $(srcdir)/kfilterbase.h
-@@ -1427,6 +1430,13 @@
+@@ -1427,6 +1633,13 @@
mocs: kfilterbase.moc
#>+ 3
@@ -18919,7 +44904,7 @@
knfsshare.moc: $(srcdir)/knfsshare.h
$(MOC) $(srcdir)/knfsshare.h -o knfsshare.moc
-@@ -1441,13 +1451,6 @@
+@@ -1441,13 +1654,6 @@
mocs: kdirlister_p.moc
#>+ 3
@@ -18933,7 +44918,7 @@
kdirwatch.moc: $(srcdir)/kdirwatch.h
$(MOC) $(srcdir)/kdirwatch.h -o kdirwatch.moc
-@@ -1462,18 +1465,18 @@
+@@ -1462,18 +1668,18 @@
mocs: ksambashare.moc
#>+ 3
@@ -18958,7 +44943,7 @@
#>+ 3
passdlg.moc: $(srcdir)/passdlg.h
-@@ -1490,18 +1493,18 @@
+@@ -1490,18 +1696,18 @@
mocs: renamedlg.moc
#>+ 3
@@ -18983,7 +44968,7 @@
#>+ 3
kscan.moc: $(srcdir)/kscan.h
-@@ -1519,7 +1522,7 @@
+@@ -1519,7 +1725,7 @@
#>+ 3
clean-metasources:
@@ -18992,7 +44977,7 @@
#>+ 2
KDE_DIST=lex.l Makefile.in configure.in.in klimitediodevice.h KFILEMETAINFO_ISSUES pastedialog.h yacc.y Makefile.am kservicegroupfactory.h
-@@ -1574,7 +1577,7 @@
+@@ -1574,7 +1780,7 @@
#>+ 11
@@ -19001,7 +44986,7 @@
@echo 'creating libkiocore_la.all_cpp.cpp ...'; \
rm -f libkiocore_la.all_cpp.files libkiocore_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkiocore_la.all_cpp.final; \
-@@ -1586,7 +1589,7 @@
+@@ -1586,7 +1792,7 @@
rm -f libkiocore_la.all_cpp.final libkiocore_la.all_cpp.files
#>+ 11
@@ -19010,7 +44995,7 @@
@echo 'creating libksycoca_la.all_cpp.cpp ...'; \
rm -f libksycoca_la.all_cpp.files libksycoca_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libksycoca_la.all_cpp.final; \
-@@ -1721,8 +1724,8 @@
+@@ -1721,8 +1927,8 @@
forwardingslavebase.lo: forwardingslavebase.moc
metainfojob.o: metainfojob.moc
kurlcompletion.o: kurlcompletion.moc
@@ -19022,7 +45007,88 @@
$(srcdir)/tcpslavebase.cpp: observer_stub.h uiserver_stub.h
--- kio/kioexec/Makefile.in
+++ kio/kioexec/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(kioexec_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -67,24 +69,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/main.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kioexec_SOURCES)
+ DIST_SOURCES = $(kioexec_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -105,6 +110,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -146,8 +153,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -224,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -261,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19032,7 +45098,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -316,6 +323,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -325,8 +333,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -344,6 +350,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -512,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19041,7 +45132,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19053,9 +45144,141 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -598,21 +605,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -727,7 +737,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/kpasswdserver/Makefile.in
+++ kio/kpasswdserver/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,8 @@
+ # $Id: Makefile.am 433401 2005-07-10 18:42:04Z adridg $
+ # Makefile.am of kdebase/kioslave/http
+
++SOURCES = $(kded_kpasswdserver_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -56,12 +58,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_moduledir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+@@ -79,24 +75,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kpasswdserver.Plo
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kpasswdserver_skel.P $(DEPDIR)/kded_kpasswdserver_la.all_cpp.P ./$(DEPDIR)/kpasswdserver.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kpasswdserver_skel.P ./$(DEPDIR)/kpasswdserver.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_kpasswdserver_la_SOURCES)
+ DIST_SOURCES = $(kded_kpasswdserver_la_SOURCES)
+ ETAGS = etags
+@@ -116,6 +116,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -157,8 +159,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -235,7 +235,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -272,6 +271,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19065,7 +45288,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -327,6 +329,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,8 +339,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -355,6 +356,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -527,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19074,7 +45322,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -565,16 +567,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19086,9 +45334,223 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -582,8 +584,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -611,21 +613,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -740,7 +745,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/kssl/Makefile.in
+++ kio/kssl/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkssl_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -80,24 +82,91 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I. -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kopenssl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksmimecrypto.Plo ./$(DEPDIR)/kssl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertchain.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertdlg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificate.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatecache.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatefactory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatehome.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslconnectioninfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslcsessioncache.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslinfodlg.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslkeygen.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslpeerinfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslpemcallback.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs12.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs7.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslsession.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslsettings.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslsigners.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslutils.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509map.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509v3.Plo
++#>+ 44
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/keygenwizard.P $(DEPDIR)/keygenwizard2.P $(DEPDIR)/libkssl_la.all_cc.P ./$(DEPDIR)/kopenssl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksmimecrypto.Plo ./$(DEPDIR)/kssl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertchain.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertdlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificate.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatecache.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatehome.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslconnectioninfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcsessioncache.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslinfodlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslkeygen.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpeerinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpemcallback.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs12.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs7.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsession.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsettings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsigners.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslutils.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509map.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509v3.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/keygenwizard.P $(DEPDIR)/keygenwizard2.P ./$(DEPDIR)/kopenssl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksmimecrypto.Plo ./$(DEPDIR)/kssl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertchain.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertdlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificate.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatecache.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatefactory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcertificatehome.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslconnectioninfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslcsessioncache.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslinfodlg.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslkeygen.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpeerinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpemcallback.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs12.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslpkcs7.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsession.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsettings.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslsigners.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslutils.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509map.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksslx509v3.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkssl_la_SOURCES)
+ DIST_SOURCES = $(libkssl_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -113,12 +182,6 @@
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive nmcheck-recursive bcheck-recursive
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(includedir)"
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+@@ -140,6 +203,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -181,8 +246,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -259,7 +322,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -296,6 +358,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19098,7 +45560,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -635,7 +638,7 @@
+@@ -351,6 +416,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,8 +426,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -379,6 +443,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -635,7 +700,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19107,7 +45594,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -673,9 +676,9 @@
+@@ -673,9 +738,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19119,18 +45606,196 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
ksslconfig.h: stamp-h4
-@@ -687,7 +690,7 @@
+@@ -687,10 +752,6 @@
stamp-h4: $(srcdir)/ksslconfig.h.in $(top_builddir)/config.status
@rm -f stamp-h4
cd $(top_builddir) && $(SHELL) ./config.status kio/kssl/ksslconfig.h
-$(srcdir)/ksslconfig.h.in: $(am__configure_deps)
-+$(srcdir)/ksslconfig.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h4
- touch $@
+- cd $(top_srcdir) && $(AUTOHEADER)
+- rm -f stamp-h4
+- touch $@
+
+ distclean-hdr:
+ -rm -f ksslconfig.h stamp-h4
+@@ -740,21 +801,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -771,7 +835,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -779,7 +843,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -791,13 +855,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -809,7 +867,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -817,13 +875,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -844,7 +896,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -944,17 +996,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -986,7 +1036,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/kssl/kssl/Makefile.in
+++ kio/kssl/kssl/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -67,12 +67,6 @@
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive nmcheck-recursive bcheck-recursive
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(confdir)"
+ confDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(conf_DATA)
+@@ -94,6 +88,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -135,8 +131,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -213,7 +207,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -250,6 +243,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19140,7 +45805,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -305,6 +301,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -314,8 +311,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -333,6 +328,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -497,7 +493,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19149,7 +45839,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19161,9 +45851,157 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -554,7 +550,7 @@
+ test -z "$(confdir)" || $(mkdir_p) "$(DESTDIR)$(confdir)"
+ @list='$(conf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
+ $(confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
+ done
+@@ -562,7 +558,7 @@
+ uninstall-confDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(conf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(confdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(confdir)/$$f"; \
+ done
+@@ -574,13 +570,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -592,7 +582,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -600,13 +590,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -627,7 +611,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -726,17 +710,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -768,7 +750,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/kssl/kssl/caroot/Makefile.in
+++ kio/kssl/kssl/caroot/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kssldatadir)"
+ kssldataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(kssldata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19173,7 +46011,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -480,7 +476,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19182,7 +46045,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +521,9 @@
+@@ -518,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19194,9 +46057,150 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -537,7 +533,7 @@
+ test -z "$(kssldatadir)" || $(mkdir_p) "$(DESTDIR)$(kssldatadir)"
+ @list='$(kssldata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kssldataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kssldatadir)/$$f'"; \
+ $(kssldataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kssldatadir)/$$f"; \
+ done
+@@ -545,7 +541,7 @@
+ uninstall-kssldataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kssldata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kssldatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kssldatadir)/$$f"; \
+ done
+@@ -609,7 +605,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/misc/Makefile.in
+++ kio/misc/Makefile.in
-@@ -339,6 +339,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,6 +37,10 @@
+
+
+
++#>- SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES)
++#>+ 1
++SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) $(kio_uiserver_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -76,16 +80,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(protocoldir)" \
+- "$(DESTDIR)$(kiomiscdir)"
++am__installdirs = "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kde_servicesdir)" "$(DESTDIR)$(protocoldir)" "$(DESTDIR)$(kiomiscdir)"
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kdeinit_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -119,29 +114,36 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kmailservice.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kio_uiserver.la.Po $(DEPDIR)/kio_uiserver_dummy.Plo $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/libkdeinit_kio_uiserver_la.all_cpp.P ./$(DEPDIR)/kmailservice.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kio_uiserver.la.Po $(DEPDIR)/kio_uiserver_dummy.Plo $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P ./$(DEPDIR)/kmailservice.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
+-#>- $(ktelnetservice_SOURCES)
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
+- $(ktelnetservice_SOURCES) $(kio_uiserver_SOURCES)
++ $(ktelnetservice_SOURCES)
+ #>- DIST_SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
+ #>- $(ktelnetservice_SOURCES)
+ #>+ 2
+@@ -183,6 +185,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -224,8 +228,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -302,7 +304,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -339,6 +340,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19206,7 +46210,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -394,6 +398,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -403,8 +408,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -422,6 +425,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -615,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19215,7 +46244,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +656,9 @@
+@@ -653,16 +657,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19227,9 +46256,306 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -670,8 +674,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -689,7 +693,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -697,8 +701,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -781,21 +785,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -812,7 +819,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -820,7 +827,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -829,7 +836,7 @@
+ test -z "$(protocoldir)" || $(mkdir_p) "$(DESTDIR)$(protocoldir)"
+ @list='$(protocol_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(protocolDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(protocoldir)/$$f'"; \
+ $(protocolDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(protocoldir)/$$f"; \
+ done
+@@ -837,7 +844,7 @@
+ uninstall-protocolDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(protocol_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(protocoldir)/$$f'"; \
+ rm -f "$(DESTDIR)$(protocoldir)/$$f"; \
+ done
+@@ -846,7 +853,7 @@
+ test -z "$(kiomiscdir)" || $(mkdir_p) "$(DESTDIR)$(kiomiscdir)"
+ @list='$(kiomisc_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kiomiscHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kiomiscdir)/$$f'"; \
+ $(kiomiscHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kiomiscdir)/$$f"; \
+ done
+@@ -854,7 +861,7 @@
+ uninstall-kiomiscHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kiomisc_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kiomiscdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kiomiscdir)/$$f"; \
+ done
+@@ -866,13 +873,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -884,7 +885,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -892,13 +893,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -919,7 +914,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -1018,17 +1013,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1063,7 +1056,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/misc/kdesasl/Makefile.in
+++ kio/misc/kdesasl/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkdesasl_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,14 +56,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(kdesaslincludedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kdesaslincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -73,24 +68,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kdesasl.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kdesasl.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkdesasl_la_SOURCES)
+ DIST_SOURCES = $(libkdesasl_la_SOURCES)
+ kdesaslincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -112,6 +110,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -153,8 +153,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -231,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19239,7 +46565,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -323,6 +323,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +333,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -351,6 +350,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -523,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19248,7 +46599,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -561,16 +561,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19260,9 +46611,164 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -578,8 +578,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -610,21 +610,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -641,7 +644,7 @@
+ test -z "$(kdesaslincludedir)" || $(mkdir_p) "$(DESTDIR)$(kdesaslincludedir)"
+ @list='$(kdesaslinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdesaslincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kdesaslincludedir)/$$f'"; \
+ $(kdesaslincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kdesaslincludedir)/$$f"; \
+ done
+@@ -649,7 +652,7 @@
+ uninstall-kdesaslincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdesaslinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdesaslincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdesaslincludedir)/$$f"; \
+ done
+@@ -755,7 +758,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/misc/kfile/Makefile.in
+++ kio/misc/kfile/Makefile.in
-@@ -261,6 +261,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(kfile_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -67,24 +69,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/fileprops.Po
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fileprops.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kfile_SOURCES)
+ DIST_SOURCES = $(kfile_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -105,6 +110,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -146,8 +153,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -224,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -261,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19272,7 +46778,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -316,6 +323,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -325,8 +333,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -344,6 +350,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -512,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19281,7 +46812,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19293,9 +46824,141 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -598,21 +605,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -726,7 +736,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/misc/kntlm/Makefile.in
+++ kio/misc/kntlm/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkntlm_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kntlmincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -75,24 +71,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/des.Plo ./$(DEPDIR)/kntlm.Plo
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkntlm_la.all_cpp.P ./$(DEPDIR)/des.Plo ./$(DEPDIR)/kntlm.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/des.Plo ./$(DEPDIR)/kntlm.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkntlm_la_SOURCES)
+ DIST_SOURCES = $(libkntlm_la_SOURCES)
+ kntlmincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -114,6 +114,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -155,8 +157,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -233,7 +233,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,6 +269,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19305,7 +46968,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -325,6 +327,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +337,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -353,6 +354,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -525,7 +527,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19314,7 +47002,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -563,16 +565,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19326,9 +47014,200 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -580,8 +582,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -613,21 +615,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -644,7 +649,7 @@
+ test -z "$(kntlmincludedir)" || $(mkdir_p) "$(DESTDIR)$(kntlmincludedir)"
+ @list='$(kntlminclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kntlmincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kntlmincludedir)/$$f'"; \
+ $(kntlmincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kntlmincludedir)/$$f"; \
+ done
+@@ -652,7 +657,7 @@
+ uninstall-kntlmincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kntlminclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kntlmincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kntlmincludedir)/$$f"; \
+ done
+@@ -758,7 +763,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/misc/kpac/Makefile.in
+++ kio/misc/kpac/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,8 @@
+
+
+
++SOURCES = $(kded_proxyscout_la_SOURCES) $(kpac_dhcp_helper_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,14 +59,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(proxyscoutdatadir)" "$(DESTDIR)$(servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(proxyscoutdatadir)" "$(DESTDIR)$(servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -90,32 +85,45 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/discovery.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/downloader.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/proxyscout.Plo ./$(DEPDIR)/script.Plo
++#>+ 8
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/proxyscout_skel.P $(DEPDIR)/kded_proxyscout_la.all_cpp.P ./$(DEPDIR)/discovery.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/downloader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/proxyscout.Plo ./$(DEPDIR)/script.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/proxyscout_skel.P ./$(DEPDIR)/discovery.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/downloader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/proxyscout.Plo ./$(DEPDIR)/script.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_proxyscout_la_SOURCES) $(kpac_dhcp_helper_SOURCES)
+ DIST_SOURCES = $(kded_proxyscout_la_SOURCES) \
+ $(kpac_dhcp_helper_SOURCES)
+@@ -140,6 +148,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -181,8 +191,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -259,7 +267,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -296,6 +303,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19338,7 +47217,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -351,6 +361,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,8 +371,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -379,6 +388,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -564,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -19347,7 +47251,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -602,16 +612,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19359,9 +47263,236 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -619,8 +629,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -683,56 +693,72 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ kpac_dhcp_helper-kpac_dhcp_helper.o: kpac_dhcp_helper.c
+ @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -MT kpac_dhcp_helper-kpac_dhcp_helper.o -MD -MP -MF "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" -c -o kpac_dhcp_helper-kpac_dhcp_helper.o `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po"; else rm -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kpac_dhcp_helper.c' object='kpac_dhcp_helper-kpac_dhcp_helper.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po' tmpdepfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -c -o kpac_dhcp_helper-kpac_dhcp_helper.o `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c
+
+ kpac_dhcp_helper-kpac_dhcp_helper.obj: kpac_dhcp_helper.c
+ @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -MT kpac_dhcp_helper-kpac_dhcp_helper.obj -MD -MP -MF "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" -c -o kpac_dhcp_helper-kpac_dhcp_helper.obj `if test -f 'kpac_dhcp_helper.c'; then $(CYGPATH_W) 'kpac_dhcp_helper.c'; else $(CYGPATH_W) '$(srcdir)/kpac_dhcp_helper.c'; fi`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po"; else rm -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kpac_dhcp_helper.c' object='kpac_dhcp_helper-kpac_dhcp_helper.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Po' tmpdepfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -c -o kpac_dhcp_helper-kpac_dhcp_helper.obj `if test -f 'kpac_dhcp_helper.c'; then $(CYGPATH_W) 'kpac_dhcp_helper.c'; else $(CYGPATH_W) '$(srcdir)/kpac_dhcp_helper.c'; fi`
+
++kpac_dhcp_helper-kpac_dhcp_helper.lo: kpac_dhcp_helper.c
++ at am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -MT kpac_dhcp_helper-kpac_dhcp_helper.lo -MD -MP -MF "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" -c -o kpac_dhcp_helper-kpac_dhcp_helper.lo `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c; \
++ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo" "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Plo"; else rm -f "$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kpac_dhcp_helper.c' object='kpac_dhcp_helper-kpac_dhcp_helper.lo' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.Plo' tmpdepfile='$(DEPDIR)/kpac_dhcp_helper-kpac_dhcp_helper.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kpac_dhcp_helper_CFLAGS) $(CFLAGS) -c -o kpac_dhcp_helper-kpac_dhcp_helper.lo `test -f 'kpac_dhcp_helper.c' || echo '$(srcdir)/'`kpac_dhcp_helper.c
++
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -749,7 +775,7 @@
+ test -z "$(proxyscoutdatadir)" || $(mkdir_p) "$(DESTDIR)$(proxyscoutdatadir)"
+ @list='$(proxyscoutdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(proxyscoutdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(proxyscoutdatadir)/$$f'"; \
+ $(proxyscoutdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(proxyscoutdatadir)/$$f"; \
+ done
+@@ -757,7 +783,7 @@
+ uninstall-proxyscoutdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(proxyscoutdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(proxyscoutdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(proxyscoutdatadir)/$$f"; \
+ done
+@@ -766,7 +792,7 @@
+ test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+ @list='$(services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
+ $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -774,7 +800,7 @@
+ uninstall-servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -880,7 +906,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/misc/ksendbugmail/Makefile.in
+++ kio/misc/ksendbugmail/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -33,6 +33,8 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ # Boston, MA 02110-1301, USA.
+
++SOURCES = $(ksendbugmail_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -85,24 +87,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/smtp.Po
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/ksendbugmail.all_cpp.P ./$(DEPDIR)/main.Po ./$(DEPDIR)/smtp.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/main.Po ./$(DEPDIR)/smtp.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ksendbugmail_SOURCES)
+ DIST_SOURCES = $(ksendbugmail_SOURCES)
+ ETAGS = etags
+@@ -122,6 +128,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -163,8 +171,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -241,7 +247,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -278,6 +283,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19371,7 +47502,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -333,6 +341,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -342,8 +351,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -361,6 +368,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -528,7 +536,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19380,7 +47536,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -566,9 +574,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19392,9 +47548,144 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -615,21 +623,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -743,7 +754,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/misc/kssld/Makefile.in
+++ kio/misc/kssld/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+
+
+
++SOURCES = $(kded_kssld_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -73,14 +75,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -96,24 +91,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kssld.Plo
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kssld_skel.P $(DEPDIR)/kded_kssld_la.all_cpp.P ./$(DEPDIR)/kssld.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kssld_skel.P ./$(DEPDIR)/kssld.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_kssld_la_SOURCES)
+ DIST_SOURCES = $(kded_kssld_la_SOURCES)
+ servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -136,6 +135,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -177,8 +178,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -255,7 +254,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -292,6 +290,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19404,7 +47695,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -548,7 +551,7 @@
+@@ -347,6 +348,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -356,8 +358,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -375,6 +375,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -548,7 +549,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19413,7 +47729,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -586,9 +589,9 @@
+@@ -586,16 +587,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19425,9 +47741,184 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -603,8 +604,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -632,21 +633,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -663,7 +667,7 @@
+ test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+ @list='$(services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
+ $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -671,7 +675,7 @@
+ uninstall-servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -777,7 +781,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/misc/kwalletd/Makefile.in
+++ kio/misc/kwalletd/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+
+
+
++SOURCES = $(kded_kwalletd_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -73,14 +75,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -98,24 +93,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/ktimeout.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwalletd.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kwalletd_skel.P $(DEPDIR)/kwalletwizard.P $(DEPDIR)/kbetterthankdialogbase.P $(DEPDIR)/kded_kwalletd_la.all_cpp.P ./$(DEPDIR)/ktimeout.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletd.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kwalletd_skel.P $(DEPDIR)/kwalletwizard.P $(DEPDIR)/kbetterthankdialogbase.P ./$(DEPDIR)/ktimeout.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletd.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kded_kwalletd_la_SOURCES)
+ DIST_SOURCES = $(kded_kwalletd_la_SOURCES)
+ servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -138,6 +140,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -179,8 +183,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -257,7 +259,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -294,6 +295,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19437,7 +47928,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -550,7 +553,7 @@
+@@ -349,6 +353,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -358,8 +363,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -377,6 +380,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -550,7 +554,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19446,7 +47962,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -588,9 +591,9 @@
+@@ -588,16 +592,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19458,9 +47974,121 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -605,8 +609,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -635,21 +639,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -666,7 +673,7 @@
+ test -z "$(servicesdir)" || $(mkdir_p) "$(DESTDIR)$(servicesdir)"
+ @list='$(services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \
+ $(servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -674,7 +681,7 @@
+ uninstall-servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicesdir)/$$f"; \
+ done
+@@ -780,7 +787,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/pics/Makefile.in
+++ kio/pics/Makefile.in
-@@ -224,6 +224,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -68,6 +68,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -109,8 +111,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -187,7 +187,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -224,6 +223,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19470,7 +48098,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -279,6 +281,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -288,8 +291,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -307,6 +308,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -470,7 +472,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -19479,7 +48132,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -508,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19491,9 +48144,149 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -579,7 +581,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kio/tests/Makefile.in
+++ kio/tests/Makefile.in
-@@ -507,6 +507,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -33,6 +33,8 @@
+ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ # Boston, MA 02110-1301, USA.
+
++SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) $(jobtest_SOURCES) $(kacltest_SOURCES) $(kdcopcheck_SOURCES) $(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) $(kdirwatchtest_SOURCES) $(kfiltertest_SOURCES) $(kionetrctest_SOURCES) $(kiopassdlgtest_SOURCES) $(kioslavetest_SOURCES) $(kmfitest_SOURCES) $(kmimefromext_SOURCES) $(kmimemagictest_SOURCES) $(kmimetypetest_SOURCES) $(kpropsdlgtest_SOURCES) $(kprotocolinfotest_SOURCES) $(kruntest_SOURCES) $(kscantest_SOURCES) $(kshredtest_SOURCES) $(ksycocatest_SOURCES) $(ksycocaupdatetest_SOURCES) $(ktartest_SOURCES) $(ktradertest_SOURCES) $(kurifiltertest_SOURCES) $(kurlcompletiontest_SOURCES) $(kziptest_SOURCES) $(metatest_SOURCES) $(netaccesstest_SOURCES) $(previewtest_SOURCES) $(speed_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,24 +286,77 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dataprotocoltest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/getalltest.Po ./$(DEPDIR)/jobtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kacltest.Po ./$(DEPDIR)/kdcopcheck.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdefaultprogresstest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirlistertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdirwatchtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfiltertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kionetrctest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kiopassdlgtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kioslavetest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmfitest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimefromext.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimemagictest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmimetypetest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpropsdlgtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfotest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kruntest.Po ./$(DEPDIR)/kscantest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kshredtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksycocatest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksycocaupdatetest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktartest.Po ./$(DEPDIR)/ktradertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurifiltertest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kurlcompletiontest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kziptest.Po ./$(DEPDIR)/metatest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/netaccesstest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/previewtest.Po ./$(DEPDIR)/speed.Po
++#>+ 26
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dataprotocoltest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/getalltest.Po ./$(DEPDIR)/jobtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kacltest.Po ./$(DEPDIR)/kdcopcheck.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdefaultprogresstest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirlistertest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdirwatchtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfiltertest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kionetrctest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiopassdlgtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kioslavetest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmfitest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimefromext.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimemagictest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmimetypetest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpropsdlgtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kprotocolinfotest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kruntest.Po ./$(DEPDIR)/kscantest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kshredtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocatest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksycocaupdatetest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktartest.Po ./$(DEPDIR)/ktradertest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurifiltertest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kurlcompletiontest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kziptest.Po ./$(DEPDIR)/metatest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/netaccesstest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/previewtest.Po ./$(DEPDIR)/speed.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) \
+ $(jobtest_SOURCES) $(kacltest_SOURCES) $(kdcopcheck_SOURCES) \
+ $(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) \
+@@ -351,6 +406,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -392,8 +449,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -470,7 +525,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -507,6 +561,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19503,7 +48296,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -789,7 +792,7 @@
+@@ -562,6 +619,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -571,8 +629,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -590,6 +646,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -789,7 +846,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19512,7 +48330,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -827,9 +830,9 @@
+@@ -827,9 +884,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19524,7 +48342,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1371,7 +1374,7 @@
+@@ -1006,21 +1063,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -1209,7 +1269,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1371,7 +1431,7 @@
-rm -f kdcopcheck.moc kdirlistertest.moc kruntest.moc jobtest.moc kdirwatchtest.moc kioslavetest.moc previewtest.moc speed.moc dummymeta.moc
#>+ 2
@@ -19535,7 +48390,45 @@
docs-am:
--- kioslave/Makefile.in
+++ kioslave/Makefile.in
-@@ -259,6 +259,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -103,6 +103,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -144,8 +146,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -222,7 +222,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -259,6 +258,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19545,7 +48438,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -505,7 +508,7 @@
+@@ -314,6 +316,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -323,8 +326,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -342,6 +343,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -505,7 +507,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -19554,7 +48472,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -543,9 +546,9 @@
+@@ -543,9 +545,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19566,9 +48484,181 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -565,13 +567,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -583,7 +579,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -591,13 +587,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -618,7 +608,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -721,14 +711,12 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -757,7 +745,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kioslave/bzip2/Makefile.in
+++ kioslave/bzip2/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(kbzip2filter_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kde_servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -73,24 +68,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kbzip2filter.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kbzip2filter.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kbzip2filter_la_SOURCES)
+ DIST_SOURCES = $(kbzip2filter_la_SOURCES)
+ kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -112,6 +110,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -153,8 +153,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -231,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19578,7 +48668,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -323,6 +323,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +333,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -351,6 +350,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -520,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19587,7 +48702,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -558,16 +558,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19599,9 +48714,180 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -575,8 +575,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -607,21 +607,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -638,7 +641,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -646,7 +649,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -752,7 +755,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kioslave/file/Makefile.in
+++ kioslave/file/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kio_file_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(fileincludedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)" "$(DESTDIR)$(fileincludedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -74,24 +69,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/file.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/file.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_file_la_SOURCES)
+ DIST_SOURCES = $(kio_file_la_SOURCES)
+ kdelnkDATA_INSTALL = $(INSTALL_DATA)
+@@ -115,6 +113,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -156,8 +156,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -234,7 +232,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -271,6 +268,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19611,7 +48897,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -326,6 +326,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +336,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -354,6 +353,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -530,7 +530,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19620,7 +48931,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -568,16 +568,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19632,9 +48943,198 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -585,8 +585,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -617,21 +617,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -648,7 +651,7 @@
+ test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -656,7 +659,7 @@
+ uninstall-kdelnkDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -665,7 +668,7 @@
+ test -z "$(fileincludedir)" || $(mkdir_p) "$(DESTDIR)$(fileincludedir)"
+ @list='$(fileinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(fileincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(fileincludedir)/$$f'"; \
+ $(fileincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(fileincludedir)/$$f"; \
+ done
+@@ -673,7 +676,7 @@
+ uninstall-fileincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(fileinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(fileincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(fileincludedir)/$$f"; \
+ done
+@@ -779,7 +782,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kioslave/ftp/Makefile.in
+++ kioslave/ftp/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kio_ftp_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kdelnkdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -74,24 +69,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/ftp.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ftp.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_ftp_la_SOURCES)
+ DIST_SOURCES = $(kio_ftp_la_SOURCES)
+ kdelnkDATA_INSTALL = $(INSTALL_DATA)
+@@ -114,6 +112,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -155,8 +155,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -233,7 +231,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,6 +267,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19644,7 +49144,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -325,6 +325,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +335,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -353,6 +352,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -525,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -19653,7 +49178,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -563,16 +563,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19665,9 +49190,180 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -580,8 +580,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -612,21 +612,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -643,7 +646,7 @@
+ test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -651,7 +654,7 @@
+ uninstall-kdelnkDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -757,7 +760,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kioslave/gzip/Makefile.in
+++ kioslave/gzip/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(kgzipfilter_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kde_servicesdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -73,24 +68,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kgzipfilter.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kgzipfilter.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kgzipfilter_la_SOURCES)
+ DIST_SOURCES = $(kgzipfilter_la_SOURCES)
+ kde_servicesDATA_INSTALL = $(INSTALL_DATA)
+@@ -112,6 +110,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -153,8 +153,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -231,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -268,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19677,7 +49373,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,7 +524,7 @@
+@@ -323,6 +323,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -332,8 +333,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -351,6 +350,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -521,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19686,7 +49407,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +562,9 @@
+@@ -559,16 +559,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19698,9 +49419,189 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -576,8 +576,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -608,21 +608,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -639,7 +642,7 @@
+ test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)"
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -647,7 +650,7 @@
+ uninstall-kde_servicesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_services_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \
+ done
+@@ -753,7 +756,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kioslave/http/Makefile.in
+++ kioslave/http/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -21,6 +21,10 @@
+
+
+
++#>- SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES)
++#>+ 1
++SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -60,15 +64,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kdelnkdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+@@ -100,27 +96,30 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/http.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner.Plo
++#>+ 2
++ at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kio_http_cache_cleaner.la.Po $(DEPDIR)/kio_http_cache_cleaner_dummy.Plo ./$(DEPDIR)/http.Plo \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES)
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES)
+ #>- DIST_SOURCES = $(kio_http_la_SOURCES) \
+ #>- $(kio_http_cache_cleaner_la_SOURCES)
+ #>+ 2
+@@ -160,6 +159,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -201,8 +202,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -279,7 +278,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -316,6 +314,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19710,7 +49611,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -371,6 +372,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,8 +382,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -399,6 +399,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -19719,7 +49645,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -621,16 +622,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19731,9 +49657,332 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -638,8 +639,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -657,7 +658,7 @@
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -665,8 +666,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -684,7 +685,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -692,8 +693,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -755,42 +756,48 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -807,7 +814,7 @@
+ test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -815,7 +822,7 @@
+ uninstall-kdelnkDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -827,13 +834,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -845,7 +846,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -853,13 +854,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -880,7 +875,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -980,17 +975,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1024,7 +1017,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kioslave/http/kcookiejar/Makefile.in
+++ kioslave/http/kcookiejar/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -19,6 +19,10 @@
+
+
+
++#>- SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
++#>+ 1
++SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,16 +61,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cookiedir)" \
+- "$(DESTDIR)$(kdeddir)" "$(DESTDIR)$(updatedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdeinitdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cookiedir)" "$(DESTDIR)$(kdeddir)" "$(DESTDIR)$(updatedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ kdeinitLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+@@ -101,27 +96,35 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcookiejar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kcookiejar.la.Po $(DEPDIR)/kcookiejar_dummy.Plo $(DEPDIR)/kcookieserver_skel.P $(DEPDIR)/kded_kcookiejar_la.all_cpp.P ./$(DEPDIR)/kcookiejar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kcookiejar.la.Po $(DEPDIR)/kcookiejar_dummy.Plo $(DEPDIR)/kcookieserver_skel.P ./$(DEPDIR)/kcookiejar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-#>- SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
+ #>- DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES)
+@@ -160,6 +163,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -201,8 +206,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -279,7 +282,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -316,6 +318,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19743,7 +49992,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -371,6 +376,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,8 +386,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -399,6 +403,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -588,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19752,7 +50026,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,16 +631,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19764,7 +50038,227 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1167,18 +1170,18 @@
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -643,8 +648,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -662,7 +667,7 @@
+ test -z "$(kdeinitdir)" || $(mkdir_p) "$(DESTDIR)$(kdeinitdir)"
+ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kdeinitdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kdeinitLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kdeinitdir)/$$f"; \
+ else :; fi; \
+@@ -670,8 +675,8 @@
+
+ uninstall-kdeinitLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kdeinit_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kdeinitdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kdeinitdir)/$$p"; \
+ done
+@@ -689,7 +694,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -697,8 +702,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -759,21 +764,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -790,7 +798,7 @@
+ test -z "$(cookiedir)" || $(mkdir_p) "$(DESTDIR)$(cookiedir)"
+ @list='$(cookie_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(cookieDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(cookiedir)/$$f'"; \
+ $(cookieDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(cookiedir)/$$f"; \
+ done
+@@ -798,7 +806,7 @@
+ uninstall-cookieDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(cookie_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(cookiedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(cookiedir)/$$f"; \
+ done
+@@ -807,7 +815,7 @@
+ test -z "$(kdeddir)" || $(mkdir_p) "$(DESTDIR)$(kdeddir)"
+ @list='$(kded_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdedDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdeddir)/$$f'"; \
+ $(kdedDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdeddir)/$$f"; \
+ done
+@@ -815,7 +823,7 @@
+ uninstall-kdedDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kded_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdeddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdeddir)/$$f"; \
+ done
+@@ -824,7 +832,7 @@
+ test -z "$(updatedir)" || $(mkdir_p) "$(DESTDIR)$(updatedir)"
+ @list='$(update_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(updateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(updatedir)/$$f'"; \
+ $(updateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+@@ -832,7 +840,7 @@
+ uninstall-updateDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(update_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(updatedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(updatedir)/$$f"; \
+ done
+@@ -844,13 +852,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -862,7 +864,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -870,13 +872,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -897,7 +893,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -996,17 +992,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -1040,7 +1034,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1167,18 +1161,18 @@
kcookiejar_DEPENDENCIES = libkdeinit_kcookiejar.la
#>+ 3
@@ -19789,7 +50283,7 @@
#>+ 5
kcookieserver.kidl: $(srcdir)/kcookieserver.h $(DCOP_DEPENDENCIES)
-@@ -1188,7 +1191,7 @@
+@@ -1188,7 +1182,7 @@
#>+ 3
clean-metasources:
@@ -19798,7 +50292,7 @@
#>+ 2
KDE_DIST=kcookiescfg.upd Makefile.in kcookiejar.h kcookiejar.desktop rfc2965 kcookieserver.h domain_info netscape_cookie_spec.html kcookiewin.h rfc2109 Makefile.am
-@@ -1240,7 +1243,7 @@
+@@ -1240,7 +1234,7 @@
#>+ 11
@@ -19807,7 +50301,7 @@
@echo 'creating kded_kcookiejar_la.all_cpp.cpp ...'; \
rm -f kded_kcookiejar_la.all_cpp.files kded_kcookiejar_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kded_kcookiejar_la.all_cpp.final; \
-@@ -1293,5 +1296,5 @@
+@@ -1293,5 +1287,5 @@
nmcheck-am: nmcheck
kcookiewin.lo: kcookiewin.moc
kcookieserver.lo: kcookieserver.moc
@@ -19816,7 +50310,88 @@
+kcookiewin.o: kcookiewin.moc
--- kioslave/http/kcookiejar/tests/Makefile.in
+++ kioslave/http/kcookiejar/tests/Makefile.in
-@@ -257,6 +257,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+ # $Id: Makefile.am 362284 2004-11-11 18:14:09Z waba $
+ # Makefile.am of kdebase/kioslave/http
++SOURCES = $(kcookiejartest_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -64,24 +66,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcookiejartest.Po
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kcookiejartest.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcookiejartest_SOURCES)
+ DIST_SOURCES = $(kcookiejartest_SOURCES)
+ ETAGS = etags
+@@ -101,6 +106,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -142,8 +149,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -220,7 +225,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -257,6 +261,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19826,7 +50401,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -312,6 +319,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -321,8 +329,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -340,6 +346,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -506,7 +513,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19835,7 +50435,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -544,9 +551,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19847,9 +50447,143 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -571,21 +578,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -698,7 +708,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kioslave/metainfo/Makefile.in
+++ kioslave/metainfo/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kio_metainfo_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(kdelnkdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kdelnkdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -74,24 +69,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/metainfo.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/metainfo.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kio_metainfo_la_SOURCES)
+ DIST_SOURCES = $(kio_metainfo_la_SOURCES)
+ kdelnkDATA_INSTALL = $(INSTALL_DATA)
+@@ -114,6 +112,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -155,8 +155,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -233,7 +231,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,6 +267,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19859,7 +50593,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -325,6 +325,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +335,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -353,6 +352,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -525,7 +525,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19868,7 +50627,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -563,16 +563,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19880,9 +50639,256 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -580,8 +580,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -612,21 +612,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -643,7 +646,7 @@
+ test -z "$(kdelnkdir)" || $(mkdir_p) "$(DESTDIR)$(kdelnkdir)"
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kdelnkDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ $(kdelnkDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -651,7 +654,7 @@
+ uninstall-kdelnkDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kdelnk_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kdelnkdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kdelnkdir)/$$f"; \
+ done
+@@ -757,7 +760,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kjs/Makefile.in
+++ kjs/Makefile.in
-@@ -316,6 +316,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -34,6 +34,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) $(testkjs_static_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -74,12 +76,6 @@
+ $(top_builddir)/kdecore/kdemacros.h \
+ $(top_builddir)/kio/kssl/ksslconfig.h global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kjsincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -119,24 +115,106 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I.
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/array_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/bool_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/collector.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/date_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/debugger.Plo ./$(DEPDIR)/dtoa.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/error_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/function.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/function_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/grammar.Plo ./$(DEPDIR)/identifier.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/internal.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/interpreter.Plo ./$(DEPDIR)/lexer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/list.Plo ./$(DEPDIR)/lookup.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/math_object.Plo ./$(DEPDIR)/nodes.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/nodes2string.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/number_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/object_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/operations.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/property_map.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/reference.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/reference_list.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/regexp.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/regexp_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/scope_chain.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/string_object.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testkjs.Po ./$(DEPDIR)/ustring.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/value.Plo
++#>+ 54
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkjs_la.all_cpp.P ./$(DEPDIR)/array_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/bool_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/collector.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/date_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/debugger.Plo ./$(DEPDIR)/dtoa.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/error_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/function.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/function_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/grammar.Plo ./$(DEPDIR)/identifier.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/internal.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/interpreter.Plo ./$(DEPDIR)/lexer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/list.Plo ./$(DEPDIR)/lookup.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/math_object.Plo ./$(DEPDIR)/nodes.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/nodes2string.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/number_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/object_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/operations.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/property_map.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/reference.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/reference_list.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/regexp.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/regexp_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/scope_chain.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/string_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testkjs.Po ./$(DEPDIR)/ustring.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/value.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/array_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/bool_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/collector.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/date_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/debugger.Plo ./$(DEPDIR)/dtoa.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/error_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/function.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/function_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/grammar.Plo ./$(DEPDIR)/identifier.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/internal.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/interpreter.Plo ./$(DEPDIR)/lexer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/list.Plo ./$(DEPDIR)/lookup.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/math_object.Plo ./$(DEPDIR)/nodes.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/nodes2string.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/number_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/object_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/operations.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/property_map.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/reference.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/reference_list.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/regexp.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/regexp_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/scope_chain.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/string_object.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testkjs.Po ./$(DEPDIR)/ustring.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/value.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) \
+ $(testkjs_static_SOURCES)
+ DIST_SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) \
+@@ -160,6 +238,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -201,8 +281,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -279,7 +357,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -316,6 +393,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19892,7 +50898,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -371,6 +451,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -380,8 +461,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -399,6 +478,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -606,7 +686,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19901,7 +50932,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +724,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19913,18 +50944,220 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
global.h: stamp-h5
-@@ -658,7 +661,7 @@
+@@ -658,10 +738,6 @@
stamp-h5: $(srcdir)/global.h.in $(top_builddir)/config.status
@rm -f stamp-h5
cd $(top_builddir) && $(SHELL) ./config.status kjs/global.h
-$(srcdir)/global.h.in: $(am__configure_deps)
-+$(srcdir)/global.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h5
- touch $@
+- cd $(top_srcdir) && $(AUTOHEADER)
+- rm -f stamp-h5
+- touch $@
+
+ distclean-hdr:
+ -rm -f global.h stamp-h5
+@@ -670,7 +746,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -678,8 +754,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -755,21 +831,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -786,7 +865,7 @@
+ test -z "$(kjsincludedir)" || $(mkdir_p) "$(DESTDIR)$(kjsincludedir)"
+ @list='$(kjsinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kjsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kjsincludedir)/$$f'"; \
+ $(kjsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kjsincludedir)/$$f"; \
+ done
+@@ -794,7 +873,7 @@
+ uninstall-kjsincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kjsinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kjsincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kjsincludedir)/$$f"; \
+ done
+@@ -903,7 +982,7 @@
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kmdi/Makefile.in
+++ kmdi/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkmdi_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -82,24 +78,58 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kmdichildarea.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrm.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrmcaption.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildview.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdidockcontainer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdidocumentviewtabwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdifocuslist.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdiguiclient.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmdimainfrm.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmditaskbar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmditoolviewaccessor.Plo
++#>+ 22
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkmdi_la.all_cpp.P ./$(DEPDIR)/kmdichildarea.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrm.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrmcaption.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdidockcontainer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdidocumentviewtabwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdifocuslist.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdiguiclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdimainfrm.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmditaskbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmditoolviewaccessor.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kmdichildarea.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrm.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildfrmcaption.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdichildview.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdidockcontainer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdidocumentviewtabwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdifocuslist.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdiguiclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmdimainfrm.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmditaskbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmditoolviewaccessor.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkmdi_la_SOURCES)
+ DIST_SOURCES = $(libkmdi_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -135,6 +165,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -176,8 +208,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -254,7 +284,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -291,6 +320,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -19934,7 +51167,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -346,6 +378,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -355,8 +388,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -374,6 +405,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -551,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19943,7 +51201,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,16 +621,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19955,7 +51213,151 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1090,18 +1093,18 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -606,8 +638,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -645,21 +677,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -676,7 +711,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -684,7 +719,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -696,13 +731,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -714,7 +743,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -722,13 +751,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -749,7 +772,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -849,17 +872,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -891,7 +912,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1090,18 +1111,18 @@
mocs: kmdichildfrm.moc
#>+ 3
@@ -19980,7 +51382,7 @@
#>+ 3
kmdifocuslist.moc: $(srcdir)/kmdifocuslist.h
-@@ -1147,7 +1150,7 @@
+@@ -1147,7 +1168,7 @@
#>+ 3
clean-metasources:
@@ -19989,7 +51391,7 @@
#>+ 2
KDE_DIST=kmdiguiclient.h Makefile.in kmdidockcontainer.h kmdidocumentviewtabwidget.h kmdifocuslist.h Makefile.am kmditoolviewaccessor_p.h
-@@ -1194,7 +1197,7 @@
+@@ -1194,7 +1215,7 @@
#>+ 11
@@ -20000,7 +51402,114 @@
echo "#define KDE_USE_FINAL 1" >> libkmdi_la.all_cpp.final; \
--- kmdi/kmdi/Makefile.in
+++ kmdi/kmdi/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkmdi2_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kmdiincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -78,24 +74,40 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/dockcontainer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/guiclient.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/tabwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/toolviewaccessor.Plo
++#>+ 10
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkmdi2_la.all_cpp.P ./$(DEPDIR)/dockcontainer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/guiclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tabwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/toolviewaccessor.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/dockcontainer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/guiclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tabwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/toolviewaccessor.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkmdi2_la_SOURCES)
+ DIST_SOURCES = $(libkmdi2_la_SOURCES)
+ kmdiincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -117,6 +129,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -158,8 +172,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -236,7 +248,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -273,6 +284,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20010,7 +51519,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -328,6 +342,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,8 +352,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -356,6 +369,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -526,7 +540,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20019,7 +51553,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -564,16 +578,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20031,7 +51565,81 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -941,18 +944,18 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -581,8 +595,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -614,21 +628,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -645,7 +662,7 @@
+ test -z "$(kmdiincludedir)" || $(mkdir_p) "$(DESTDIR)$(kmdiincludedir)"
+ @list='$(kmdiinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kmdiincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kmdiincludedir)/$$f'"; \
+ $(kmdiincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kmdiincludedir)/$$f"; \
+ done
+@@ -653,7 +670,7 @@
+ uninstall-kmdiincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kmdiinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kmdiincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kmdiincludedir)/$$f"; \
+ done
+@@ -760,7 +777,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -941,18 +958,18 @@
mocs: toolviewaccessor.moc
#>+ 3
@@ -20056,7 +51664,7 @@
#>+ 3
guiclient.moc: $(srcdir)/guiclient.h
-@@ -970,7 +973,7 @@
+@@ -970,7 +987,7 @@
#>+ 3
clean-metasources:
@@ -20065,7 +51673,7 @@
#>+ 2
KDE_DIST=Makefile.in dockcontainer.h toolviewaccessor_p.h guiclient.h Makefile.am
-@@ -1017,7 +1020,7 @@
+@@ -1017,7 +1034,7 @@
#>+ 11
@@ -20074,7 +51682,7 @@
@echo 'creating libkmdi2_la.all_cpp.cpp ...'; \
rm -f libkmdi2_la.all_cpp.files libkmdi2_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkmdi2_la.all_cpp.final; \
-@@ -1054,14 +1057,14 @@
+@@ -1054,14 +1071,14 @@
#>+ 13
nmcheck:
@@ -20093,7 +51701,92 @@
dockcontainer.o: dockcontainer.moc
--- kmdi/test/Makefile.in
+++ kmdi/test/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(kfourchildren_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -65,24 +67,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/hello.Po ./$(DEPDIR)/main.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/mainwidget.Po
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kfourchildren.all_cpp.P ./$(DEPDIR)/hello.Po ./$(DEPDIR)/main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwidget.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/hello.Po ./$(DEPDIR)/main.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwidget.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kfourchildren_SOURCES)
+ DIST_SOURCES = $(kfourchildren_SOURCES)
+ ETAGS = etags
+@@ -102,6 +111,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -143,8 +154,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -221,7 +230,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -258,6 +266,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20103,7 +51796,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -313,6 +324,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -322,8 +334,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -341,6 +351,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -508,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20112,7 +51830,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -546,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20124,9 +51842,178 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -575,21 +586,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -701,7 +715,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- knewstuff/Makefile.in
+++ knewstuff/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -18,6 +18,8 @@
+
+
+
++SOURCES = $(libknewstuff_la_SOURCES) $(ghns_SOURCES) $(khotnewstuff_SOURCES) $(testnewstuff_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -59,15 +61,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(kde_confdir)" "$(DESTDIR)$(knewstuffdir)" \
+- "$(DESTDIR)$(knsdir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(kde_confdir)" "$(DESTDIR)$(knewstuffdir)" "$(DESTDIR)$(knsdir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -105,24 +99,61 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/downloaddialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/engine.Plo ./$(DEPDIR)/entry.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ghns.Po ./$(DEPDIR)/khotnewstuff.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knewstuff.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffbutton.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffgeneric.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffsecure.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/provider.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/providerdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/security.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testnewstuff.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/uploaddialog.Plo
++#>+ 24
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libknewstuff_la.all_cpp.P ./$(DEPDIR)/downloaddialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/engine.Plo ./$(DEPDIR)/entry.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ghns.Po ./$(DEPDIR)/khotnewstuff.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuff.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffgeneric.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffsecure.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/provider.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/providerdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/security.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testnewstuff.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/uploaddialog.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/downloaddialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/engine.Plo ./$(DEPDIR)/entry.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ghns.Po ./$(DEPDIR)/khotnewstuff.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuff.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffbutton.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffgeneric.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knewstuffsecure.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/provider.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/providerdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/security.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testnewstuff.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/uploaddialog.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libknewstuff_la_SOURCES) $(ghns_SOURCES) \
+ $(khotnewstuff_SOURCES) $(testnewstuff_SOURCES)
+ DIST_SOURCES = $(libknewstuff_la_SOURCES) $(ghns_SOURCES) \
+@@ -149,6 +180,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -190,8 +223,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -268,7 +299,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -305,6 +335,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20136,7 +52023,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -360,6 +393,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -369,8 +403,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -388,6 +420,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -575,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20145,7 +52057,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -613,16 +646,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20157,8 +52069,118 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1157,17 +1160,17 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -630,8 +663,8 @@
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -709,21 +742,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -740,7 +776,7 @@
+ test -z "$(kde_confdir)" || $(mkdir_p) "$(DESTDIR)$(kde_confdir)"
+ @list='$(kde_conf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_confdir)/$$f'"; \
+ $(kde_confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_confdir)/$$f"; \
+ done
+@@ -748,7 +784,7 @@
+ uninstall-kde_confDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_conf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_confdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_confdir)/$$f"; \
+ done
+@@ -757,7 +793,7 @@
+ test -z "$(knewstuffdir)" || $(mkdir_p) "$(DESTDIR)$(knewstuffdir)"
+ @list='$(knewstuff_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(knewstuffDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(knewstuffdir)/$$f'"; \
+ $(knewstuffDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(knewstuffdir)/$$f"; \
+ done
+@@ -765,7 +801,7 @@
+ uninstall-knewstuffDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(knewstuff_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(knewstuffdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(knewstuffdir)/$$f"; \
+ done
+@@ -774,7 +810,7 @@
+ test -z "$(knsdir)" || $(mkdir_p) "$(DESTDIR)$(knsdir)"
+ @list='$(kns_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(knsHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(knsdir)/$$f'"; \
+ $(knsHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(knsdir)/$$f"; \
+ done
+@@ -782,7 +818,7 @@
+ uninstall-knsHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kns_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(knsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(knsdir)/$$f"; \
+ done
+@@ -891,7 +927,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1157,17 +1193,17 @@
+
#>+ 13
install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
@@ -20180,7 +52202,129 @@
force-reedit:
--- kparts/Makefile.in
+++ kparts/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -19,6 +19,8 @@
+
+
+
++SOURCES = $(libkparts_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,14 +59,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" \
+- "$(DESTDIR)$(kpartsincludedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kpartsincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -85,24 +80,52 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/browserextension.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/browserinterface.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/browserrun.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dockmainwindow.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/event.Plo ./$(DEPDIR)/factory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/historyprovider.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo ./$(DEPDIR)/part.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/partmanager.Plo ./$(DEPDIR)/plugin.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/statusbarextension.Plo
++#>+ 18
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkparts_la.all_cpp.P ./$(DEPDIR)/browserextension.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/browserinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/browserrun.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dockmainwindow.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/event.Plo ./$(DEPDIR)/factory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/historyprovider.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo ./$(DEPDIR)/part.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/partmanager.Plo ./$(DEPDIR)/plugin.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/statusbarextension.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/browserextension.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/browserinterface.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/browserrun.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dockmainwindow.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/event.Plo ./$(DEPDIR)/factory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/historyprovider.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/mainwindow.Plo ./$(DEPDIR)/part.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/partmanager.Plo ./$(DEPDIR)/plugin.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/statusbarextension.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkparts_la_SOURCES)
+ DIST_SOURCES = $(libkparts_la_SOURCES)
+ servicetypeDATA_INSTALL = $(INSTALL_DATA)
+@@ -126,6 +149,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -167,8 +192,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -245,7 +268,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -282,6 +304,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20190,7 +52334,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -337,6 +362,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -346,8 +372,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -365,6 +389,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -551,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20199,7 +52368,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,16 +614,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20211,9 +52380,101 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1002,13 +1005,6 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -606,8 +631,8 @@
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -649,21 +674,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -680,7 +708,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -688,7 +716,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -697,7 +725,7 @@
+ test -z "$(kpartsincludedir)" || $(mkdir_p) "$(DESTDIR)$(kpartsincludedir)"
+ @list='$(kpartsinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kpartsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kpartsincludedir)/$$f'"; \
+ $(kpartsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kpartsincludedir)/$$f"; \
+ done
+@@ -705,7 +733,7 @@
+ uninstall-kpartsincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kpartsinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kpartsincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kpartsincludedir)/$$f"; \
+ done
+@@ -813,7 +841,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1002,13 +1030,6 @@
+
+
#>+ 3
-factory.moc: $(srcdir)/factory.h
- $(MOC) $(srcdir)/factory.h -o factory.moc
@@ -20225,7 +52486,7 @@
plugin.moc: $(srcdir)/plugin.h
$(MOC) $(srcdir)/plugin.h -o plugin.moc
-@@ -1023,6 +1019,13 @@
+@@ -1023,6 +1044,13 @@
mocs: dockmainwindow.moc
#>+ 3
@@ -20239,7 +52500,7 @@
historyprovider.moc: $(srcdir)/historyprovider.h
$(MOC) $(srcdir)/historyprovider.h -o historyprovider.moc
-@@ -1080,7 +1083,7 @@
+@@ -1080,7 +1108,7 @@
#>+ 3
clean-metasources:
@@ -20248,7 +52509,7 @@
#>+ 2
KDE_DIST=krop.desktop Makefile.in COMMENTS design.h krwp.desktop kpart.desktop browserview.desktop Makefile.am
-@@ -1131,7 +1134,7 @@
+@@ -1131,7 +1159,7 @@
#>+ 11
@@ -20259,7 +52520,119 @@
echo "#define KDE_USE_FINAL 1" >> libkparts_la.all_cpp.final; \
--- kparts/tests/Makefile.in
+++ kparts/tests/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libnotepad_la_SOURCES) $(libnotepadpart_la_SOURCES) $(libspellcheckplugin_la_SOURCES) $(ghostviewtest_SOURCES) $(kpartstest_SOURCES) $(normalktmtest_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,16 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(ghostviewtestdir)" "$(DESTDIR)$(notepaddir)" \
+- "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(rcdir)" \
+- "$(DESTDIR)$(testpartdir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(ghostviewtestdir)" "$(DESTDIR)$(notepaddir)" "$(DESTDIR)$(pluginsdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(testpartdir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(noinst_LTLIBRARIES)
+ libnotepad_la_LIBADD =
+@@ -107,24 +100,40 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/example.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ghostview.Po ./$(DEPDIR)/normalktm.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/notepad.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/notepadpart.Plo ./$(DEPDIR)/parts.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin_spellcheck.Plo
++#>+ 10
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kpartstest.all_cpp.P $(DEPDIR)/normalktmtest.all_cpp.P ./$(DEPDIR)/example.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ghostview.Po ./$(DEPDIR)/normalktm.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/notepad.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/notepadpart.Plo ./$(DEPDIR)/parts.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_spellcheck.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/example.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ghostview.Po ./$(DEPDIR)/normalktm.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/notepad.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/notepadpart.Plo ./$(DEPDIR)/parts.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin_spellcheck.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libnotepad_la_SOURCES) $(libnotepadpart_la_SOURCES) \
+ $(libspellcheckplugin_la_SOURCES) $(ghostviewtest_SOURCES) \
+ $(kpartstest_SOURCES) $(normalktmtest_SOURCES)
+@@ -155,6 +164,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -196,8 +207,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -274,7 +283,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -311,6 +319,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20269,7 +52642,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -366,6 +377,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -375,8 +387,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -394,6 +404,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -588,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20278,7 +52676,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,16 +637,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20290,7 +52688,153 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1030,6 +1033,13 @@
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -643,8 +654,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -713,21 +724,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -744,7 +758,7 @@
+ test -z "$(ghostviewtestdir)" || $(mkdir_p) "$(DESTDIR)$(ghostviewtestdir)"
+ @list='$(ghostviewtest_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(ghostviewtestDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(ghostviewtestdir)/$$f'"; \
+ $(ghostviewtestDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(ghostviewtestdir)/$$f"; \
+ done
+@@ -752,7 +766,7 @@
+ uninstall-ghostviewtestDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(ghostviewtest_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(ghostviewtestdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(ghostviewtestdir)/$$f"; \
+ done
+@@ -761,7 +775,7 @@
+ test -z "$(notepaddir)" || $(mkdir_p) "$(DESTDIR)$(notepaddir)"
+ @list='$(notepad_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(notepadDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(notepaddir)/$$f'"; \
+ $(notepadDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(notepaddir)/$$f"; \
+ done
+@@ -769,7 +783,7 @@
+ uninstall-notepadDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(notepad_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(notepaddir)/$$f'"; \
+ rm -f "$(DESTDIR)$(notepaddir)/$$f"; \
+ done
+@@ -778,7 +792,7 @@
+ test -z "$(pluginsdir)" || $(mkdir_p) "$(DESTDIR)$(pluginsdir)"
+ @list='$(plugins_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(pluginsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pluginsdir)/$$f'"; \
+ $(pluginsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pluginsdir)/$$f"; \
+ done
+@@ -786,7 +800,7 @@
+ uninstall-pluginsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(plugins_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(pluginsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pluginsdir)/$$f"; \
+ done
+@@ -795,7 +809,7 @@
+ test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)"
+ @list='$(rc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(rcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rcdir)/$$f'"; \
+ $(rcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rcdir)/$$f"; \
+ done
+@@ -803,7 +817,7 @@
+ uninstall-rcDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(rc_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(rcdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(rcdir)/$$f"; \
+ done
+@@ -812,7 +826,7 @@
+ test -z "$(testpartdir)" || $(mkdir_p) "$(DESTDIR)$(testpartdir)"
+ @list='$(testpart_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(testpartDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(testpartdir)/$$f'"; \
+ $(testpartDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(testpartdir)/$$f"; \
+ done
+@@ -820,7 +834,7 @@
+ uninstall-testpartDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(testpart_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(testpartdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(testpartdir)/$$f"; \
+ done
+@@ -927,7 +941,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1030,6 +1044,13 @@
mocs: ghostview.moc
#>+ 3
@@ -20304,7 +52848,7 @@
normalktm.moc: $(srcdir)/normalktm.h
$(MOC) $(srcdir)/normalktm.h -o normalktm.moc
-@@ -1044,13 +1054,6 @@
+@@ -1044,13 +1065,6 @@
mocs: example.moc
#>+ 3
@@ -20318,7 +52862,7 @@
parts.moc: $(srcdir)/parts.h
$(MOC) $(srcdir)/parts.h -o parts.moc
-@@ -1084,7 +1087,7 @@
+@@ -1084,7 +1098,7 @@
#>+ 3
clean-metasources:
@@ -20329,7 +52873,130 @@
KDE_DIST=plugin_spellcheck.h plugin_foobar.rc notepadpart.rc plugin_spellcheck.rc parts.h Makefile.in ghostview.h notepad.desktop kpartstest_part1.rc kpartstest_shell.rc normalktm.h notepad.h ghostviewtest_shell.rc example.h Makefile.am
--- kresources/Makefile.in
+++ kresources/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kcm_kresources_la_SOURCES) $(libkresources_la_SOURCES) $(testresources_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -56,15 +58,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(xdg_appsdir)" \
+- "$(DESTDIR)$(kresincludedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(xdg_appsdir)" "$(DESTDIR)$(kresincludedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
+@@ -93,24 +87,52 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/configdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/configpage.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/factory.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmkresources.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/managerimpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/selectdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testresources.Po
++#>+ 18
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/manageriface_skel.P $(DEPDIR)/manageriface_stub.P $(DEPDIR)/libkresources_la.all_cpp.P ./$(DEPDIR)/configdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/factory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmkresources.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/managerimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testresources.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/manageriface_skel.P $(DEPDIR)/manageriface_stub.P ./$(DEPDIR)/configdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configpage.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/factory.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmkresources.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/managerimpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/resource.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/selectdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testresources.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kcm_kresources_la_SOURCES) $(libkresources_la_SOURCES) \
+ $(testresources_SOURCES)
+ DIST_SOURCES = $(kcm_kresources_la_SOURCES) \
+@@ -137,6 +159,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -178,8 +202,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -256,7 +278,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -293,6 +314,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20339,7 +53006,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -348,6 +372,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +382,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -376,6 +399,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -588,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20348,7 +53040,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,16 +650,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20360,9 +53052,139 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1104,18 +1107,18 @@
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -643,8 +667,8 @@
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -662,7 +686,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -670,8 +694,8 @@
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -725,21 +749,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -756,7 +783,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -764,7 +791,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -773,7 +800,7 @@
+ test -z "$(xdg_appsdir)" || $(mkdir_p) "$(DESTDIR)$(xdg_appsdir)"
+ @list='$(xdg_apps_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(xdg_appsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdg_appsdir)/$$f'"; \
+ $(xdg_appsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdg_appsdir)/$$f"; \
+ done
+@@ -781,7 +808,7 @@
+ uninstall-xdg_appsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(xdg_apps_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(xdg_appsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(xdg_appsdir)/$$f"; \
+ done
+@@ -790,7 +817,7 @@
+ test -z "$(kresincludedir)" || $(mkdir_p) "$(DESTDIR)$(kresincludedir)"
+ @list='$(kresinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kresincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kresincludedir)/$$f'"; \
+ $(kresincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kresincludedir)/$$f"; \
+ done
+@@ -798,7 +825,7 @@
+ uninstall-kresincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kresinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kresincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kresincludedir)/$$f"; \
+ done
+@@ -906,7 +933,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1104,18 +1131,18 @@
+
+
#>+ 3
-resource.moc: $(srcdir)/resource.h
- $(MOC) $(srcdir)/resource.h -o resource.moc
@@ -20385,7 +53207,7 @@
#>+ 3
configdialog.moc: $(srcdir)/configdialog.h
-@@ -1157,7 +1160,7 @@
+@@ -1157,7 +1184,7 @@
#>+ 3
clean-metasources:
@@ -20396,7 +53218,28 @@
KDE_DIST=kcmkresources.h Makefile.in kresources.desktop kresources_manager.desktop README.design kresources_plugin.desktop Makefile.am
--- kspell2/Makefile.in
+++ kspell2/Makefile.in
-@@ -57,9 +57,7 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(libkspell2base_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,9 +59,7 @@
$(top_builddir)/kjs/global.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -20407,7 +53250,99 @@
am_libkspell2base_la_OBJECTS = settings.lo broker.lo client.lo \
filter.lo backgroundchecker.lo backgroundthread.lo \
backgroundengine.lo defaultdictionary.lo
-@@ -293,6 +291,9 @@
+@@ -74,24 +74,43 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/backgroundchecker.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/backgroundengine.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/backgroundthread.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/broker.Plo ./$(DEPDIR)/client.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/defaultdictionary.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/settings.Plo
++#>+ 12
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkspell2base_la.all_cpp.P ./$(DEPDIR)/backgroundchecker.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/backgroundengine.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/backgroundthread.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/broker.Plo ./$(DEPDIR)/client.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultdictionary.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/settings.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/backgroundchecker.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/backgroundengine.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/backgroundthread.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/broker.Plo ./$(DEPDIR)/client.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/defaultdictionary.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/settings.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkspell2base_la_SOURCES)
+ DIST_SOURCES = $(libkspell2base_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -107,14 +126,7 @@
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive nmcheck-recursive bcheck-recursive
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(servicetypedir)" \
+- "$(DESTDIR)$(kspell2baseincludedir)"
++am__installdirs = "$(DESTDIR)$(servicetypedir)" "$(DESTDIR)$(kspell2baseincludedir)"
+ servicetypeDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(servicetype_DATA)
+ kspell2baseincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -137,6 +149,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -178,8 +192,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -256,7 +268,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -293,6 +304,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20417,7 +53352,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -549,7 +550,6 @@
+@@ -348,6 +362,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -357,8 +372,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -376,6 +389,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -549,7 +563,6 @@
#>- libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
#>+ 1
libkspell2base_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
@@ -20425,7 +53385,7 @@
servicetype_DATA = kspellclient.desktop
servicetypedir = $(kde_servicetypesdir)
#>- all: all-recursive
-@@ -558,7 +558,7 @@
+@@ -558,7 +571,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20434,7 +53394,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -596,9 +596,9 @@
+@@ -596,9 +609,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20446,9 +53406,190 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -634,21 +647,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -665,7 +681,7 @@
+ test -z "$(servicetypedir)" || $(mkdir_p) "$(DESTDIR)$(servicetypedir)"
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(servicetypeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ $(servicetypeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -673,7 +689,7 @@
+ uninstall-servicetypeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(servicetype_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicetypedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicetypedir)/$$f"; \
+ done
+@@ -682,7 +698,7 @@
+ test -z "$(kspell2baseincludedir)" || $(mkdir_p) "$(DESTDIR)$(kspell2baseincludedir)"
+ @list='$(kspell2baseinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kspell2baseincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kspell2baseincludedir)/$$f'"; \
+ $(kspell2baseincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kspell2baseincludedir)/$$f"; \
+ done
+@@ -690,7 +706,7 @@
+ uninstall-kspell2baseincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kspell2baseinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kspell2baseincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kspell2baseincludedir)/$$f"; \
+ done
+@@ -702,13 +718,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -720,7 +730,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -728,13 +738,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -755,7 +759,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -855,17 +859,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -897,7 +899,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kspell2/plugins/Makefile.in
+++ kspell2/plugins/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -84,6 +84,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -125,8 +127,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -203,7 +203,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20458,7 +53599,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -295,6 +297,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,8 +307,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -323,6 +324,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -487,7 +489,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20467,7 +53633,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -525,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20479,9 +53645,185 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -547,13 +549,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -565,7 +561,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -573,13 +569,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -600,7 +590,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -702,14 +692,12 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -738,7 +726,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kspell2/plugins/aspell/Makefile.in
+++ kspell2/plugins/aspell/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(kspell_aspell_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ kspell_aspell_la_DEPENDENCIES = ../../ui/libkspell2.la
+@@ -76,24 +71,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kspell_aspellclient.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspell_aspelldict.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kspell_aspell_la.all_cpp.P ./$(DEPDIR)/kspell_aspellclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_aspelldict.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kspell_aspellclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_aspelldict.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kspell_aspell_la_SOURCES)
+ DIST_SOURCES = $(kspell_aspell_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -115,6 +117,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -156,8 +160,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -234,7 +236,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -271,6 +272,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20491,7 +53833,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -326,6 +330,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +340,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -354,6 +357,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -530,7 +534,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20500,7 +53867,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -568,16 +572,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20512,9 +53879,184 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -585,8 +589,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -618,21 +622,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -649,7 +656,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -657,7 +664,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -763,7 +770,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kspell2/plugins/hspell/Makefile.in
+++ kspell2/plugins/hspell/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(kspell_hspell_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ kspell_hspell_la_DEPENDENCIES = ../../ui/libkspell2.la
+@@ -76,24 +71,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kspell_hspellclient.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspell_hspelldict.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kspell_hspell_la.all_cpp.P ./$(DEPDIR)/kspell_hspellclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_hspelldict.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kspell_hspellclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_hspelldict.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kspell_hspell_la_SOURCES)
+ DIST_SOURCES = $(kspell_hspell_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -115,6 +117,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -156,8 +160,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -234,7 +236,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -271,6 +272,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20524,7 +54066,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -326,6 +330,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -335,8 +340,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -354,6 +357,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -530,7 +534,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20533,7 +54100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -568,16 +572,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20545,9 +54112,199 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -585,8 +589,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -618,21 +622,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -649,7 +656,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -657,7 +664,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -763,7 +770,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kspell2/plugins/ispell/Makefile.in
+++ kspell2/plugins/ispell/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(kspell_ispell_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -53,14 +55,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \
+- "$(DESTDIR)$(servicedir)"
++am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(servicedir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ kspell_ispell_la_DEPENDENCIES = ../../ui/libkspell2.la
+@@ -78,24 +73,46 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/correct.Plo ./$(DEPDIR)/good.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/hash.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ispell_checker.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispellclient.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispelldict.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/lookup.Plo ./$(DEPDIR)/makedent.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/tgood.Plo
++#>+ 14
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kspell_ispell_la.all_cpp.P ./$(DEPDIR)/correct.Plo ./$(DEPDIR)/good.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/hash.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ispell_checker.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispellclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispelldict.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lookup.Plo ./$(DEPDIR)/makedent.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tgood.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/correct.Plo ./$(DEPDIR)/good.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/hash.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ispell_checker.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispellclient.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kspell_ispelldict.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lookup.Plo ./$(DEPDIR)/makedent.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tgood.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kspell_ispell_la_SOURCES)
+ DIST_SOURCES = $(kspell_ispell_la_SOURCES)
+ serviceDATA_INSTALL = $(INSTALL_DATA)
+@@ -117,6 +134,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -158,8 +177,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -236,7 +253,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -273,6 +289,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20557,7 +54314,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -540,7 +543,7 @@
+@@ -328,6 +347,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,8 +357,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -356,6 +374,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -540,7 +559,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20566,7 +54348,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -578,9 +581,9 @@
+@@ -578,16 +597,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20578,9 +54360,104 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -595,8 +614,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -635,21 +654,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -666,7 +688,7 @@
+ test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
+ $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -674,7 +696,7 @@
+ uninstall-serviceDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(service_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(servicedir)/$$f"; \
+ done
+@@ -780,7 +802,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kspell2/tests/Makefile.in
+++ kspell2/tests/Makefile.in
-@@ -71,7 +71,8 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(backgroundtest_SOURCES) $(test_SOURCES) $(test_configdialog_SOURCES) $(test_dialog_SOURCES) $(test_filter_SOURCES) $(test_highlighter_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -71,7 +73,8 @@
#>+ 1
test_configdialog_OBJECTS = test_configdialog.$(OBJEXT)
test_configdialog_DEPENDENCIES = ../ui/libkspell2_noinst.la \
@@ -20590,7 +54467,7 @@
am_test_dialog_OBJECTS = test_dialog.$(OBJEXT)
#>- test_dialog_OBJECTS = $(am_test_dialog_OBJECTS)
#>+ 1
-@@ -87,7 +88,8 @@
+@@ -87,28 +90,42 @@
#>+ 1
test_highlighter_OBJECTS = test_highlighter.$(OBJEXT)
test_highlighter_DEPENDENCIES = ../ui/libkspell2_noinst.la \
@@ -20600,7 +54477,73 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-@@ -288,6 +290,9 @@
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/backgroundtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_configdialog.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_dialog.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_filter.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/test_highlighter.Po
++#>+ 6
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/backgroundtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_configdialog.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_dialog.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_filter.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test_highlighter.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(backgroundtest_SOURCES) $(test_SOURCES) \
+ $(test_configdialog_SOURCES) $(test_dialog_SOURCES) \
+ $(test_filter_SOURCES) $(test_highlighter_SOURCES)
+@@ -132,6 +149,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -173,8 +192,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -251,7 +268,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -288,6 +304,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20610,7 +54553,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,16 +543,16 @@
+@@ -343,6 +362,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -352,8 +372,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -371,6 +389,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -538,16 +557,16 @@
test_dialog_SOURCES = test_dialog.cpp
test_dialog_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
test_highlighter_SOURCES = test_highlighter.cpp
@@ -20630,7 +54598,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -585,9 +590,9 @@
+@@ -585,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20642,10 +54610,79 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -632,21 +651,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -758,7 +780,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kspell2/ui/Makefile.in
+++ kspell2/ui/Makefile.in
-@@ -64,7 +64,9 @@
- "$(DESTDIR)$(kspell2includedir)"
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkspell2_la_SOURCES) $(libkspell2_noinst_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,17 +56,12 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(kspell2includedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kspell2includedir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
-libkspell2_la_DEPENDENCIES = libkspell2_noinst.la ../libkspell2base.la
@@ -20655,7 +54692,74 @@
am_libkspell2_la_OBJECTS = dialog.lo
#>- libkspell2_la_OBJECTS = $(am_libkspell2_la_OBJECTS)
#>+ 1
-@@ -278,6 +280,9 @@
+@@ -82,24 +79,34 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/configdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/highlighter.Plo
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kspell2ui.P $(DEPDIR)/configui.P $(DEPDIR)/libkspell2_noinst_la.all_cpp.P ./$(DEPDIR)/configdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/highlighter.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kspell2ui.P $(DEPDIR)/configui.P ./$(DEPDIR)/configdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configwidget.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/highlighter.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkspell2_la_SOURCES) $(libkspell2_noinst_la_SOURCES)
+ DIST_SOURCES = $(libkspell2_la_SOURCES) \
+ $(libkspell2_noinst_la_SOURCES)
+@@ -122,6 +129,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -163,8 +172,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -241,7 +248,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -278,6 +284,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20665,7 +54769,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,14 +542,14 @@
+@@ -333,6 +342,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -342,8 +352,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -361,6 +369,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -537,14 +546,14 @@
#>- libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
#>+ 1
libkspell2_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0:0 $(all_libraries)
@@ -20682,7 +54811,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -582,9 +587,9 @@
+@@ -582,16 +591,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20694,9 +54823,121 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -599,8 +608,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -645,21 +654,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -676,7 +688,7 @@
+ test -z "$(kspell2includedir)" || $(mkdir_p) "$(DESTDIR)$(kspell2includedir)"
+ @list='$(kspell2include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kspell2includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kspell2includedir)/$$f'"; \
+ $(kspell2includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kspell2includedir)/$$f"; \
+ done
+@@ -684,7 +696,7 @@
+ uninstall-kspell2includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kspell2include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kspell2includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kspell2includedir)/$$f"; \
+ done
+@@ -790,7 +802,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/Makefile.in
+++ kstyles/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -84,6 +84,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -125,8 +127,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -203,7 +203,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20706,7 +54947,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -295,6 +297,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,8 +307,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -323,6 +324,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -485,7 +487,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -20715,7 +54981,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -523,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20727,9 +54993,182 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -545,13 +547,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -563,7 +559,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -571,13 +567,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -598,7 +588,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -697,17 +687,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -736,7 +724,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/highcolor/Makefile.in
+++ kstyles/highcolor/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(highcolor_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -73,12 +75,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_styledir)"
+ kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_style_LTLIBRARIES)
+@@ -90,24 +86,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/highcolor.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/highcolor.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(highcolor_la_SOURCES)
+ DIST_SOURCES = $(highcolor_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -128,6 +127,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -169,8 +170,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -247,7 +246,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -284,6 +282,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20739,7 +55178,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -339,6 +340,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -348,8 +350,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -367,6 +367,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -537,7 +538,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20748,7 +55212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -575,16 +576,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20760,9 +55224,162 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
+ else :; fi; \
+@@ -592,8 +593,8 @@
+
+ uninstall-kde_styleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
+ done
+@@ -624,21 +625,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -752,7 +756,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/highcontrast/Makefile.in
+++ kstyles/highcontrast/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+
+
+
++SOURCES = $(highcontrast_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -73,14 +75,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_styledir)" \
+- "$(DESTDIR)$(stylercdir)"
++am__installdirs = "$(DESTDIR)$(kde_styledir)" "$(DESTDIR)$(stylercdir)"
+ kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_style_LTLIBRARIES)
+ highcontrast_la_DEPENDENCIES = ../../kdefx/libkdefx.la
+@@ -91,24 +86,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/highcontrast.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/highcontrast.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(highcontrast_la_SOURCES)
+ DIST_SOURCES = $(highcontrast_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -145,6 +143,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -186,8 +186,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -264,7 +262,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -301,6 +298,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20772,7 +55389,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -356,6 +356,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -365,8 +366,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -384,6 +383,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -560,7 +560,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20781,7 +55423,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,16 +598,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20793,9 +55435,247 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
+ else :; fi; \
+@@ -615,8 +615,8 @@
+
+ uninstall-kde_styleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
+ done
+@@ -647,21 +647,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -678,7 +681,7 @@
+ test -z "$(stylercdir)" || $(mkdir_p) "$(DESTDIR)$(stylercdir)"
+ @list='$(stylerc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(stylercDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(stylercdir)/$$f'"; \
+ $(stylercDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(stylercdir)/$$f"; \
+ done
+@@ -686,7 +689,7 @@
+ uninstall-stylercDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(stylerc_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(stylercdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(stylercdir)/$$f"; \
+ done
+@@ -698,13 +701,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -716,7 +713,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -724,13 +721,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -751,7 +742,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -850,17 +841,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -892,7 +881,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+ maintainer-clean-generic:
--- kstyles/highcontrast/config/Makefile.in
+++ kstyles/highcontrast/config/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(kstyle_highcontrast_config_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_moduledir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+@@ -73,24 +69,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/highcontrastconfig.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/highcontrastconfig.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kstyle_highcontrast_config_la_SOURCES)
+ DIST_SOURCES = $(kstyle_highcontrast_config_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -111,6 +110,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -152,8 +153,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -230,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -267,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20805,7 +55685,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -322,6 +323,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -331,8 +333,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -350,6 +350,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -519,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20814,7 +55719,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -557,16 +558,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20826,9 +55731,169 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -574,8 +575,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -606,21 +607,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -734,7 +738,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/keramik/Makefile.in
+++ kstyles/keramik/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(keramik_la_SOURCES) $(genembed_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -56,12 +58,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_styledir)"
+ kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_style_LTLIBRARIES)
+@@ -84,24 +80,37 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/colorutil.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/genembed.Po ./$(DEPDIR)/gradients.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/keramik.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/pixmaploader.Plo
++#>+ 8
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/keramik_la.all_cpp.P ./$(DEPDIR)/colorutil.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/genembed.Po ./$(DEPDIR)/gradients.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keramik.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pixmaploader.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/colorutil.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/genembed.Po ./$(DEPDIR)/gradients.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keramik.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/pixmaploader.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(keramik_la_SOURCES) $(genembed_SOURCES)
+ DIST_SOURCES = $(keramik_la_SOURCES) $(genembed_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -122,6 +131,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -163,8 +174,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -241,7 +250,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -278,6 +286,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20838,7 +55903,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -333,6 +344,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -342,8 +354,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -361,6 +371,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -537,7 +548,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20847,7 +55937,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -575,16 +586,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20859,9 +55949,163 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
+ else :; fi; \
+@@ -592,8 +603,8 @@
+
+ uninstall-kde_styleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
+ done
+@@ -638,21 +649,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -766,7 +780,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/klegacy/Makefile.in
+++ kstyles/klegacy/Makefile.in
-@@ -269,6 +269,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(klegacystyle_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -75,24 +71,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/klegacystyle.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugin.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/klegacystyle_la.all_cpp.P ./$(DEPDIR)/klegacystyle.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/klegacystyle.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugin.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(klegacystyle_la_SOURCES)
+ DIST_SOURCES = $(klegacystyle_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -113,6 +116,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -154,8 +159,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -232,7 +235,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -269,6 +271,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20871,7 +56115,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -324,6 +329,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -333,8 +339,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -352,6 +356,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -523,7 +528,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20880,7 +56149,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -561,16 +566,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20892,9 +56161,166 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -578,8 +583,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -611,21 +616,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -739,7 +747,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/kthemestyle/Makefile.in
+++ kstyles/kthemestyle/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(kthemestyle_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -73,12 +75,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_styledir)"
+ kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_style_LTLIBRARIES)
+@@ -94,24 +90,34 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kstyledirs.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kthemebase.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kthemestyle.Plo
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kthemestyle_la.all_cpp.P ./$(DEPDIR)/kstyledirs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kthemebase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kthemestyle.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kstyledirs.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kthemebase.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kthemestyle.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kthemestyle_la_SOURCES)
+ DIST_SOURCES = $(kthemestyle_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -132,6 +138,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -173,8 +181,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -251,7 +257,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -288,6 +293,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20904,7 +56330,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -343,6 +351,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -352,8 +361,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -371,6 +378,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -541,7 +549,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20913,7 +56364,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,16 +587,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20925,9 +56376,166 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
+ else :; fi; \
+@@ -596,8 +604,8 @@
+
+ uninstall-kde_styleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
+ done
+@@ -630,21 +638,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -758,7 +769,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/light/Makefile.in
+++ kstyles/light/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -35,6 +35,8 @@
+ # Boston, MA 02110-1301, USA.
+
+
++SOURCES = $(light_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -73,12 +75,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_styledir)"
+ kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_style_LTLIBRARIES)
+@@ -94,24 +90,34 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/light.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v2.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v3.Plo
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/light_la.all_cpp.P ./$(DEPDIR)/light.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v2.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v3.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/light.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v2.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lightstyle-v3.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(light_la_SOURCES)
+ DIST_SOURCES = $(light_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -132,6 +138,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -173,8 +181,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -251,7 +257,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -288,6 +293,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20937,7 +56545,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -343,6 +351,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -352,8 +361,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -371,6 +378,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -541,7 +549,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20946,7 +56579,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,16 +587,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20958,9 +56591,163 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
+ else :; fi; \
+@@ -596,8 +604,8 @@
+
+ uninstall-kde_styleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
+ done
+@@ -630,21 +638,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -758,7 +769,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/plastik/Makefile.in
+++ kstyles/plastik/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(plastik_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_styledir)" \
+- "$(DESTDIR)$(stylercdir)"
++am__installdirs = "$(DESTDIR)$(kde_styledir)" "$(DESTDIR)$(stylercdir)"
+ kde_styleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_style_LTLIBRARIES)
+ plastik_la_DEPENDENCIES = ../../kdefx/libkdefx.la
+@@ -76,24 +71,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/misc.Plo ./$(DEPDIR)/plastik.Plo
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/plastik_la.all_cpp.P ./$(DEPDIR)/misc.Plo ./$(DEPDIR)/plastik.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/misc.Plo ./$(DEPDIR)/plastik.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(plastik_la_SOURCES)
+ DIST_SOURCES = $(plastik_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -130,6 +129,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -171,8 +172,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -249,7 +248,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -286,6 +284,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -20970,7 +56757,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -341,6 +342,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -350,8 +352,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -369,6 +369,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -545,7 +546,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20979,7 +56791,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,16 +584,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20991,9 +56803,247 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_styledir)" || $(mkdir_p) "$(DESTDIR)$(kde_styledir)"
+ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_styledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_styleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_styledir)/$$f"; \
+ else :; fi; \
+@@ -600,8 +601,8 @@
+
+ uninstall-kde_styleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_style_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_styledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_styledir)/$$p"; \
+ done
+@@ -633,21 +634,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -664,7 +668,7 @@
+ test -z "$(stylercdir)" || $(mkdir_p) "$(DESTDIR)$(stylercdir)"
+ @list='$(stylerc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(stylercDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(stylercdir)/$$f'"; \
+ $(stylercDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(stylercdir)/$$f"; \
+ done
+@@ -672,7 +676,7 @@
+ uninstall-stylercDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(stylerc_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(stylercdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(stylercdir)/$$f"; \
+ done
+@@ -684,13 +688,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -702,7 +700,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -710,13 +708,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -737,7 +729,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -836,17 +828,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -878,7 +868,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+ maintainer-clean-generic:
--- kstyles/plastik/config/Makefile.in
+++ kstyles/plastik/config/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(kstyle_plastik_config_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(kde_moduledir)"
+ kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+@@ -73,24 +69,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/plastikconf.Plo
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/plastikconf.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kstyle_plastik_config_la_SOURCES)
+ DIST_SOURCES = $(kstyle_plastik_config_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -111,6 +110,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -152,8 +153,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -230,7 +229,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -267,6 +265,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21003,7 +57053,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -519,7 +522,7 @@
+@@ -322,6 +323,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -331,8 +333,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -350,6 +350,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -519,7 +520,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21012,7 +57087,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -557,9 +560,9 @@
+@@ -557,16 +558,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21024,9 +57099,116 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
+ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
+ else :; fi; \
+@@ -574,8 +575,8 @@
+
+ uninstall-kde_moduleLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
+ done
+@@ -606,21 +607,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -734,7 +738,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/riscos/Makefile.in
+++ kstyles/riscos/Makefile.in
-@@ -235,6 +235,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(pixmapdir)" "$(DESTDIR)$(themercdir)"
+ pixmapDATA_INSTALL = $(INSTALL_DATA)
+ themercDATA_INSTALL = $(INSTALL_DATA)
+@@ -79,6 +73,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -120,8 +116,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -198,7 +192,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -235,6 +228,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21036,7 +57218,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -290,6 +286,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -299,8 +296,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -318,6 +313,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -517,7 +513,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21045,7 +57252,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +551,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21057,7 +57264,52 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -735,7 +738,7 @@
+@@ -574,7 +570,7 @@
+ test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
+ @list='$(pixmap_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(pixmapDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pixmapdir)/$$f'"; \
+ $(pixmapDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pixmapdir)/$$f"; \
+ done
+@@ -582,7 +578,7 @@
+ uninstall-pixmapDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pixmap_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(pixmapdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pixmapdir)/$$f"; \
+ done
+@@ -591,7 +587,7 @@
+ test -z "$(themercdir)" || $(mkdir_p) "$(DESTDIR)$(themercdir)"
+ @list='$(themerc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(themercDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themercdir)/$$f'"; \
+ $(themercDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themercdir)/$$f"; \
+ done
+@@ -599,7 +595,7 @@
+ uninstall-themercDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(themerc_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(themercdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(themercdir)/$$f"; \
+ done
+@@ -663,7 +659,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -735,7 +731,7 @@
.NOEXPORT:
#>+ 2
@@ -21068,7 +57320,61 @@
docs-am:
--- kstyles/themes/Makefile.in
+++ kstyles/themes/Makefile.in
-@@ -236,6 +236,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,14 +54,7 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(kde_confdir)" \
+- "$(DESTDIR)$(kstylethemesdatadir)"
++am__installdirs = "$(DESTDIR)$(kde_confdir)" "$(DESTDIR)$(kstylethemesdatadir)"
+ kde_confDATA_INSTALL = $(INSTALL_DATA)
+ kstylethemesdataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(kde_conf_DATA) $(kstylethemesdata_DATA)
+@@ -80,6 +73,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -121,8 +116,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -199,7 +192,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -236,6 +228,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21078,7 +57384,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -291,6 +286,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -300,8 +296,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -319,6 +313,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -489,7 +484,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21087,7 +57418,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21099,9 +57430,92 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -546,7 +541,7 @@
+ test -z "$(kde_confdir)" || $(mkdir_p) "$(DESTDIR)$(kde_confdir)"
+ @list='$(kde_conf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_confDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_confdir)/$$f'"; \
+ $(kde_confDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_confdir)/$$f"; \
+ done
+@@ -554,7 +549,7 @@
+ uninstall-kde_confDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_conf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_confdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_confdir)/$$f"; \
+ done
+@@ -563,7 +558,7 @@
+ test -z "$(kstylethemesdatadir)" || $(mkdir_p) "$(DESTDIR)$(kstylethemesdatadir)"
+ @list='$(kstylethemesdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kstylethemesdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kstylethemesdatadir)/$$f'"; \
+ $(kstylethemesdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kstylethemesdatadir)/$$f"; \
+ done
+@@ -571,7 +566,7 @@
+ uninstall-kstylethemesdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kstylethemesdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kstylethemesdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kstylethemesdatadir)/$$f"; \
+ done
+@@ -635,7 +630,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/utils/Makefile.in
+++ kstyles/utils/Makefile.in
-@@ -240,6 +240,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -84,6 +84,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -125,8 +127,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -203,7 +203,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -240,6 +239,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21111,7 +57525,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -295,6 +297,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -304,8 +307,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -323,6 +324,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -485,7 +487,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21120,7 +57559,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -523,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21132,9 +57571,169 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -545,13 +547,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -563,7 +559,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -571,13 +567,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -598,7 +588,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -697,17 +687,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -736,7 +724,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/utils/installtheme/Makefile.in
+++ kstyles/utils/installtheme/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(kinstalltheme_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -65,24 +67,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/main.Po
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/main.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kinstalltheme_SOURCES)
+ DIST_SOURCES = $(kinstalltheme_SOURCES)
+ ETAGS = etags
+@@ -102,6 +107,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -143,8 +150,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -221,7 +226,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -258,6 +262,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21144,7 +57743,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -313,6 +320,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -322,8 +330,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -341,6 +347,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -516,7 +523,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21153,7 +57777,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -554,9 +561,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21165,9 +57789,147 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
+@@ -602,21 +609,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -730,7 +740,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kstyles/web/Makefile.in
+++ kstyles/web/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(webstyle_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -55,14 +57,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(kstylewebdatadir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kstylewebdatadir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -77,24 +72,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/plugin.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/webstyle.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/webstyle_la.all_cpp.P ./$(DEPDIR)/plugin.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/webstyle.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/plugin.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/webstyle.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(webstyle_la_SOURCES)
+ DIST_SOURCES = $(webstyle_la_SOURCES)
+ kstylewebdataDATA_INSTALL = $(INSTALL_DATA)
+@@ -117,6 +119,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -158,8 +162,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -236,7 +238,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -273,6 +274,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21177,7 +57939,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -328,6 +332,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,8 +342,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -356,6 +359,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -529,7 +533,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21186,7 +57973,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -567,16 +571,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21198,9 +57985,190 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -584,8 +588,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -617,21 +621,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -648,7 +655,7 @@
+ test -z "$(kstylewebdatadir)" || $(mkdir_p) "$(DESTDIR)$(kstylewebdatadir)"
+ @list='$(kstylewebdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kstylewebdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kstylewebdatadir)/$$f'"; \
+ $(kstylewebdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kstylewebdatadir)/$$f"; \
+ done
+@@ -656,7 +663,7 @@
+ uninstall-kstylewebdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kstylewebdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kstylewebdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kstylewebdatadir)/$$f"; \
+ done
+@@ -762,7 +769,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kunittest/Makefile.in
+++ kunittest/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(kunittest_samplemodule_la_SOURCES) $(libkunittest_la_SOURCES) $(kunittestmodrunner_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -57,14 +59,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+- "$(DESTDIR)$(libkunittestincludedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libkunittestincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ kunittest_samplemodule_la_DEPENDENCIES = libkunittest.la
+@@ -93,24 +88,37 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/modrunner.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/runner.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/samplemodule.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/tester.Plo
++#>+ 8
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkunittest_la.all_cpp.P ./$(DEPDIR)/modrunner.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/runner.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/samplemodule.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tester.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/modrunner.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/runner.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/samplemodule.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tester.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kunittest_samplemodule_la_SOURCES) \
+ $(libkunittest_la_SOURCES) $(kunittestmodrunner_SOURCES)
+ DIST_SOURCES = $(kunittest_samplemodule_la_SOURCES) \
+@@ -134,6 +142,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -175,8 +185,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -253,7 +261,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -290,6 +297,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21210,7 +58178,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -345,6 +355,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -354,8 +365,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -373,6 +382,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -553,7 +563,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21219,7 +58212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -591,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21231,9 +58224,215 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkLTLIBRARIES:
+@@ -609,7 +619,7 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -617,8 +627,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -682,21 +692,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -713,7 +726,7 @@
+ test -z "$(libkunittestincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkunittestincludedir)"
+ @list='$(libkunittestinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(libkunittestincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libkunittestincludedir)/$$f'"; \
+ $(libkunittestincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libkunittestincludedir)/$$f"; \
+ done
+@@ -721,7 +734,7 @@
+ uninstall-libkunittestincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(libkunittestinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(libkunittestincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(libkunittestincludedir)/$$f"; \
+ done
+@@ -832,7 +845,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kutils/Makefile.in
+++ kutils/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -17,6 +17,8 @@
+
+
+
++SOURCES = $(libkutils_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -56,14 +58,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(includedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(kde_servicetypesdir)" "$(DESTDIR)$(includedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libkutils_la_DEPENDENCIES = ../kio/libkio.la ksettings/libksettings.la
+@@ -85,24 +80,61 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kcmodulecontainer.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleinfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleloader.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxy.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxyIfaceImpl.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmultidialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfind.Plo ./$(DEPDIR)/kfinddialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmultitabbar.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kplugininfo.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kpluginselector.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kreplace.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kreplacedialog.Plo
++#>+ 24
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kcmoduleproxyIface_skel.P $(DEPDIR)/libkutils_la.all_cpp.P ./$(DEPDIR)/kcmodulecontainer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleloader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxyIfaceImpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmultidialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfind.Plo ./$(DEPDIR)/kfinddialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmultitabbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplugininfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpluginselector.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreplace.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreplacedialog.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kcmoduleproxyIface_skel.P ./$(DEPDIR)/kcmodulecontainer.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleinfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleloader.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxy.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmoduleproxyIfaceImpl.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmultidialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfind.Plo ./$(DEPDIR)/kfinddialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmultitabbar.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kplugininfo.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kpluginselector.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreplace.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreplacedialog.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkutils_la_SOURCES)
+ DIST_SOURCES = $(libkutils_la_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -140,6 +172,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -181,8 +215,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -259,7 +291,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -296,6 +327,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21243,7 +58442,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -351,6 +385,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -360,8 +395,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -379,6 +412,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -574,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21252,7 +58476,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -612,16 +646,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21264,9 +58488,171 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1135,18 +1138,18 @@
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -629,8 +663,8 @@
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -673,21 +707,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -704,7 +741,7 @@
+ test -z "$(kde_servicetypesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicetypesdir)"
+ @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(kde_servicetypesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
+ $(kde_servicetypesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
+ done
+@@ -712,7 +749,7 @@
+ uninstall-kde_servicetypesDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(kde_servicetypes_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(kde_servicetypesdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(kde_servicetypesdir)/$$f"; \
+ done
+@@ -721,7 +758,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -729,7 +766,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -741,13 +778,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -759,7 +790,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -767,13 +798,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -794,7 +819,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -894,17 +919,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -936,7 +959,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -1135,18 +1158,18 @@
+
+
#>+ 3
-kcmultidialog.moc: $(srcdir)/kcmultidialog.h
- $(MOC) $(srcdir)/kcmultidialog.h -o kcmultidialog.moc
@@ -21289,7 +58675,7 @@
#>+ 3
kpluginselector.moc: $(srcdir)/kpluginselector.h
-@@ -1205,22 +1208,22 @@
+@@ -1205,22 +1228,22 @@
mocs: kpluginselector_p.moc
#>+ 3
@@ -21319,7 +58705,7 @@
#>+ 2
KDE_DIST=kdeglobals.kcfgc Makefile.in kdeglobals.kcfg kplugininfo.desktop Makefile.am
-@@ -1276,7 +1279,7 @@
+@@ -1276,7 +1299,7 @@
#>+ 11
@@ -21330,7 +58716,103 @@
echo "#define KDE_USE_FINAL 1" >> libkutils_la.all_cpp.final; \
--- kutils/ksettings/Makefile.in
+++ kutils/ksettings/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libksettings_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -68,32 +70,36 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/componentsdialog.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/dispatcher.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/pluginpage.Plo
++#>+ 6
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libksettings_la.all_cpp.P ./$(DEPDIR)/componentsdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/dispatcher.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pluginpage.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/componentsdialog.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dialog.Plo ./$(DEPDIR)/dispatcher.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/pluginpage.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libksettings_la_SOURCES)
+ DIST_SOURCES = $(libksettings_la_SOURCES)
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(ksettingsincludedir)"
+ ksettingsincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(ksettingsinclude_HEADERS)
+@@ -114,6 +120,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -155,8 +163,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -233,7 +239,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,6 +275,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21340,7 +58822,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -521,7 +524,7 @@
+@@ -325,6 +333,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +343,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -353,6 +360,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -521,7 +529,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21349,7 +58856,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -559,9 +562,9 @@
+@@ -559,9 +567,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21361,9 +58868,147 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -590,21 +598,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -621,7 +632,7 @@
+ test -z "$(ksettingsincludedir)" || $(mkdir_p) "$(DESTDIR)$(ksettingsincludedir)"
+ @list='$(ksettingsinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(ksettingsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ksettingsincludedir)/$$f'"; \
+ $(ksettingsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ksettingsincludedir)/$$f"; \
+ done
+@@ -629,7 +640,7 @@
+ uninstall-ksettingsincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(ksettingsinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(ksettingsincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(ksettingsincludedir)/$$f"; \
+ done
+@@ -735,7 +746,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kutils/tests/Makefile.in
+++ kutils/tests/Makefile.in
-@@ -258,6 +258,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(kfindtest_SOURCES) $(kreplacetest_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -65,24 +67,29 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kfindtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kreplacetest.Po
++#>+ 2
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kfindtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kreplacetest.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kfindtest_SOURCES) $(kreplacetest_SOURCES)
+ DIST_SOURCES = $(kfindtest_SOURCES) $(kreplacetest_SOURCES)
+ ETAGS = etags
+@@ -102,6 +109,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -143,8 +152,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -221,7 +228,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -258,6 +264,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21373,7 +59018,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -313,6 +322,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -322,8 +332,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -341,6 +349,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -512,7 +521,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21382,7 +59052,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +559,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21394,9 +59064,84 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -581,21 +590,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -781,7 +793,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kwallet/Makefile.in
+++ kwallet/Makefile.in
-@@ -241,6 +241,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -85,6 +85,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -126,8 +128,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -204,7 +204,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -241,6 +240,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21406,7 +59151,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -296,6 +298,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -305,8 +308,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -324,6 +325,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -488,7 +490,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21415,7 +59185,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -526,9 +528,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21427,9 +59197,192 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -548,13 +550,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -566,7 +562,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -574,13 +570,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -601,7 +591,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -701,17 +691,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -740,7 +728,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kwallet/backend/Makefile.in
+++ kwallet/backend/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkwalletbackend_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -78,24 +74,37 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/blockcipher.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/blowfish.Plo ./$(DEPDIR)/cbc.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwalletbackend.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwalletentry.Plo ./$(DEPDIR)/sha1.Plo
++#>+ 8
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkwalletbackend_la.all_cc.P ./$(DEPDIR)/blockcipher.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/blowfish.Plo ./$(DEPDIR)/cbc.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletbackend.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletentry.Plo ./$(DEPDIR)/sha1.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/blockcipher.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/blowfish.Plo ./$(DEPDIR)/cbc.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletbackend.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletentry.Plo ./$(DEPDIR)/sha1.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkwalletbackend_la_SOURCES)
+ DIST_SOURCES = $(libkwalletbackend_la_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+@@ -116,6 +125,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -157,8 +168,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -235,7 +244,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -272,6 +280,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21439,7 +59392,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -327,6 +338,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -336,8 +348,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -355,6 +365,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -539,7 +550,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21448,7 +59426,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -577,16 +588,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21460,9 +59438,148 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -594,8 +605,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -631,21 +642,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -759,7 +773,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kwallet/backend/tests/Makefile.in
+++ kwallet/backend/tests/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(backendtest_SOURCES) $(testbf_SOURCES) $(testsha_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -76,24 +78,29 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/backendtest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/testbf.Po ./$(DEPDIR)/testsha.Po
++#>+ 2
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/backendtest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testbf.Po ./$(DEPDIR)/testsha.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(backendtest_SOURCES) $(testbf_SOURCES) $(testsha_SOURCES)
+ DIST_SOURCES = $(backendtest_SOURCES) $(testbf_SOURCES) \
+ $(testsha_SOURCES)
+@@ -114,6 +121,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -155,8 +164,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -233,7 +240,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,6 +276,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21472,7 +59589,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,7 @@
+@@ -325,6 +334,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +344,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -353,6 +361,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -522,7 +531,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21481,7 +59623,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -560,9 +563,9 @@
+@@ -560,9 +569,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21493,9 +59635,141 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -595,21 +604,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -721,7 +733,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kwallet/client/Makefile.in
+++ kwallet/client/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkwalletclient_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -75,24 +71,28 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kwallet.Plo
++#>+ 2
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kwallet_skel.P $(DEPDIR)/libkwalletclient_la.all_cc.P ./$(DEPDIR)/kwallet.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = $(DEPDIR)/kwallet_skel.P ./$(DEPDIR)/kwallet.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkwalletclient_la_SOURCES)
+ DIST_SOURCES = $(libkwalletclient_la_SOURCES)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -114,6 +114,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -155,8 +157,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -233,7 +233,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,6 +269,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21505,7 +59779,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -529,7 +532,7 @@
+@@ -325,6 +327,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +337,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -353,6 +354,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -529,7 +531,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21514,7 +59813,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -567,9 +570,9 @@
+@@ -567,16 +569,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21526,9 +59825,174 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -584,8 +586,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -616,21 +618,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -647,7 +652,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -655,7 +660,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -761,7 +766,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- kwallet/tests/Makefile.in
+++ kwallet/tests/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,6 +14,8 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++SOURCES = $(kwalletasync_SOURCES) $(kwalletboth_SOURCES) $(kwalletsync_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -79,24 +81,37 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kwalletasync.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwalletboth.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwalletsync.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwallettest.Po
++#>+ 8
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/kwalletasync.all_cpp.P $(DEPDIR)/kwalletboth.all_cpp.P ./$(DEPDIR)/kwalletasync.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletboth.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletsync.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwallettest.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kwalletasync.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletboth.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwalletsync.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwallettest.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kwalletasync_SOURCES) $(kwalletboth_SOURCES) \
+ $(kwalletsync_SOURCES)
+ DIST_SOURCES = $(kwalletasync_SOURCES) $(kwalletboth_SOURCES) \
+@@ -118,6 +133,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -159,8 +176,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -237,7 +252,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,6 +288,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21538,7 +60002,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -530,7 +533,7 @@
+@@ -329,6 +346,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,8 +356,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -357,6 +373,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -530,7 +547,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21547,7 +60036,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -568,9 +571,9 @@
+@@ -568,9 +585,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21559,9 +60048,168 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
+@@ -604,21 +621,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -730,7 +750,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- libkmid/Makefile.in
+++ libkmid/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkmid_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,14 +56,7 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(libdir)" \
+- "$(DESTDIR)$(libkmidincludedir)"
++am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmidincludedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+@@ -83,24 +78,52 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/alsaout.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dattypes.Plo ./$(DEPDIR)/deviceman.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/fmout.Plo ./$(DEPDIR)/gusout.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/libkmid.Plo ./$(DEPDIR)/midfile.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/midimapper.Plo ./$(DEPDIR)/midiout.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/midistat.Plo ./$(DEPDIR)/mt32togm.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/notearray.Plo ./$(DEPDIR)/player.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/synthout.Plo ./$(DEPDIR)/track.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/voiceman.Plo
++#>+ 18
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkmid_la.all_cc.P ./$(DEPDIR)/alsaout.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dattypes.Plo ./$(DEPDIR)/deviceman.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/fmout.Plo ./$(DEPDIR)/gusout.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkmid.Plo ./$(DEPDIR)/midfile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/midimapper.Plo ./$(DEPDIR)/midiout.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/midistat.Plo ./$(DEPDIR)/mt32togm.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/notearray.Plo ./$(DEPDIR)/player.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/synthout.Plo ./$(DEPDIR)/track.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/voiceman.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/alsaout.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dattypes.Plo ./$(DEPDIR)/deviceman.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/fmout.Plo ./$(DEPDIR)/gusout.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/libkmid.Plo ./$(DEPDIR)/midfile.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/midimapper.Plo ./$(DEPDIR)/midiout.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/midistat.Plo ./$(DEPDIR)/mt32togm.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/notearray.Plo ./$(DEPDIR)/player.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/synthout.Plo ./$(DEPDIR)/track.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/voiceman.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkmid_la_SOURCES)
+ DIST_SOURCES = $(libkmid_la_SOURCES)
+ libkmidincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -122,6 +145,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -163,8 +188,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -241,7 +264,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -278,6 +300,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21571,7 +60219,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -333,6 +358,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -342,8 +368,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -361,6 +385,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -545,7 +570,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -21580,7 +60253,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,16 +608,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21592,9 +60265,176 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -600,8 +625,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -647,21 +672,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -678,7 +706,7 @@
+ test -z "$(libkmidincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkmidincludedir)"
+ @list='$(libkmidinclude_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(libkmidincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libkmidincludedir)/$$f'"; \
+ $(libkmidincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libkmidincludedir)/$$f"; \
+ done
+@@ -686,7 +714,7 @@
+ uninstall-libkmidincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(libkmidinclude_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(libkmidincludedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(libkmidincludedir)/$$f"; \
+ done
+@@ -793,7 +821,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- libkmid/tests/Makefile.in
+++ libkmid/tests/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(apitest_SOURCES) $(ctest_SOURCES) $(notesoff_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -72,32 +74,37 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/apitest.Po ./$(DEPDIR)/ctest.Po \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/notesoff.Po
++#>+ 2
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/apitest.Po ./$(DEPDIR)/ctest.Po \
++ at AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/notesoff.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(apitest_SOURCES) $(ctest_SOURCES) $(notesoff_SOURCES)
+ DIST_SOURCES = $(apitest_SOURCES) $(ctest_SOURCES) $(notesoff_SOURCES)
+ ETAGS = etags
+@@ -117,6 +124,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -158,8 +167,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -236,7 +243,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -273,6 +279,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21604,7 +60444,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -328,6 +337,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -337,8 +347,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -356,6 +364,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -525,7 +534,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -21613,7 +60478,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -563,9 +572,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21625,9 +60490,171 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
+@@ -598,42 +607,48 @@
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ .cc.o:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cc.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cc.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -744,7 +759,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- libkscreensaver/Makefile.in
+++ libkscreensaver/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libkscreensaver_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -54,12 +56,6 @@
+ $(top_builddir)/kio/kssl/ksslconfig.h \
+ $(top_builddir)/kjs/global.h
+ CONFIG_CLEAN_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+@@ -75,24 +71,31 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/kscreensaver.Plo \
++#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
++#>+ 4
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES = $(DEPDIR)/libkscreensaver_la.all_cpp.P ./$(DEPDIR)/kscreensaver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES = ./$(DEPDIR)/kscreensaver.Plo \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libkscreensaver_la_SOURCES)
+ DIST_SOURCES = $(libkscreensaver_la_SOURCES)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+@@ -114,6 +117,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -155,8 +160,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -233,7 +236,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -270,6 +272,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21637,7 +60664,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -523,7 +526,7 @@
+@@ -325,6 +330,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -334,8 +340,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -353,6 +357,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -523,7 +528,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21646,7 +60698,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -561,9 +564,9 @@
+@@ -561,16 +566,16 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21658,9 +60710,144 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+ test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ else :; fi; \
+@@ -578,8 +583,8 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ done
+@@ -608,21 +613,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -639,7 +647,7 @@
+ test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+ $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -647,7 +655,7 @@
+ uninstall-includeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(include_HEADERS)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(includedir)/$$f"; \
+ done
+@@ -754,7 +762,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- libltdl/Makefile.in
+++ libltdl/Makefile.in
-@@ -248,6 +248,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,6 +16,8 @@
+ @SET_MAKE@
+
+
++SOURCES = $(libltdlc_la_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -66,11 +68,11 @@
+ am__depfiles_maybe =
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libltdlc_la_SOURCES)
+ DIST_SOURCES = $(libltdlc_la_SOURCES)
+@@ -92,6 +94,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -133,8 +137,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -211,7 +213,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -248,6 +249,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21670,7 +60857,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -303,6 +307,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -312,8 +317,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -331,6 +334,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -498,7 +502,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -21679,7 +60891,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -536,9 +540,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21691,9 +60903,69 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
+@@ -675,7 +679,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- licenses/Makefile.in
+++ licenses/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(licensesdatadir)"
+ licensesdataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(licensesdata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21703,7 +60975,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -480,7 +476,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21712,7 +61009,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +521,9 @@
+@@ -518,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21724,9 +61021,87 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -537,7 +533,7 @@
+ test -z "$(licensesdatadir)" || $(mkdir_p) "$(DESTDIR)$(licensesdatadir)"
+ @list='$(licensesdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(licensesdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(licensesdatadir)/$$f'"; \
+ $(licensesdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(licensesdatadir)/$$f"; \
+ done
+@@ -545,7 +541,7 @@
+ uninstall-licensesdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(licensesdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(licensesdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(licensesdatadir)/$$f"; \
+ done
+@@ -609,7 +605,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- mimetypes/Makefile.in
+++ mimetypes/Makefile.in
-@@ -250,6 +250,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -67,12 +67,6 @@
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive nmcheck-recursive bcheck-recursive
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypesdatadir)"
+ mimetypesdataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypesdata_DATA)
+@@ -94,6 +88,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -135,8 +131,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -213,7 +207,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -250,6 +243,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21736,7 +61111,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -305,6 +301,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -314,8 +311,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -333,6 +328,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -497,7 +493,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -21745,7 +61145,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21757,9 +61157,157 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -554,7 +550,7 @@
+ test -z "$(mimetypesdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypesdatadir)"
+ @list='$(mimetypesdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypesdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypesdatadir)/$$f'"; \
+ $(mimetypesdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypesdatadir)/$$f"; \
+ done
+@@ -562,7 +558,7 @@
+ uninstall-mimetypesdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypesdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypesdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypesdatadir)/$$f"; \
+ done
+@@ -574,13 +570,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -592,7 +582,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -600,13 +590,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -627,7 +611,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -726,17 +710,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -768,7 +750,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- mimetypes/application/Makefile.in
+++ mimetypes/application/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypeapplicationdatadir)"
+ mimetypeapplicationdataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypeapplicationdata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21769,7 +61317,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -504,7 +500,7 @@
x-kspread.desktop x-kugar.desktop x-kword.desktop \
x-quattropro.desktop x-amipro.desktop x-tgif.desktop \
x-lyx.desktop x-zerosize.desktop x-kpovmodeler.desktop x-cda.desktop \
@@ -21778,7 +61351,7 @@
x-hancomword.desktop \
x-font-bdf.desktop x-font-pcf.desktop x-font-speedo.desktop x-font-type1.desktop \
x-font-ghostscript.desktop x-font-snf.desktop x-font-ttf.desktop \
-@@ -549,7 +552,7 @@
+@@ -549,7 +545,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21787,7 +61360,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -587,9 +590,9 @@
+@@ -587,9 +583,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21799,7 +61372,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -756,7 +759,7 @@
+@@ -606,7 +602,7 @@
+ test -z "$(mimetypeapplicationdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeapplicationdatadir)"
+ @list='$(mimetypeapplicationdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypeapplicationdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypeapplicationdatadir)/$$f'"; \
+ $(mimetypeapplicationdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypeapplicationdatadir)/$$f"; \
+ done
+@@ -614,7 +610,7 @@
+ uninstall-mimetypeapplicationdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypeapplicationdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypeapplicationdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypeapplicationdatadir)/$$f"; \
+ done
+@@ -678,7 +674,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -756,7 +752,7 @@
.NOEXPORT:
#>+ 2
@@ -21810,7 +61410,58 @@
docs-am:
--- mimetypes/audio/Makefile.in
+++ mimetypes/audio/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypeaudiodatadir)"
+ mimetypeaudiodataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypeaudiodata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21820,7 +61471,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -490,7 +486,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21829,7 +61505,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -528,9 +524,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21841,7 +61517,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -690,7 +693,7 @@
+@@ -547,7 +543,7 @@
+ test -z "$(mimetypeaudiodatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeaudiodatadir)"
+ @list='$(mimetypeaudiodata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypeaudiodataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypeaudiodatadir)/$$f'"; \
+ $(mimetypeaudiodataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypeaudiodatadir)/$$f"; \
+ done
+@@ -555,7 +551,7 @@
+ uninstall-mimetypeaudiodataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypeaudiodata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypeaudiodatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypeaudiodatadir)/$$f"; \
+ done
+@@ -619,7 +615,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -690,7 +686,7 @@
.NOEXPORT:
#>+ 2
@@ -21852,7 +61555,58 @@
docs-am:
--- mimetypes/image/Makefile.in
+++ mimetypes/image/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypeimagedatadir)"
+ mimetypeimagedataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypeimagedata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21862,7 +61616,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,8 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -481,7 +477,8 @@
x-portable-pixmap.desktop x-pcx.desktop x-targa.desktop jp2.desktop \
x-vnd.trolltech.qpicture.desktop x-vnd.adobe.photoshop.desktop \
x-xcursor.desktop pjpeg.desktop x-exr.desktop \
@@ -21872,7 +61651,7 @@
mimetypeimagedatadir = $(kde_mimedir)/image
EXTRA_DIST = $(mimetypeimagedata_DATA)
-@@ -490,7 +494,7 @@
+@@ -490,7 +487,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21881,7 +61660,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -528,9 +532,9 @@
+@@ -528,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21893,7 +61672,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -694,7 +698,7 @@
+@@ -547,7 +544,7 @@
+ test -z "$(mimetypeimagedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeimagedatadir)"
+ @list='$(mimetypeimagedata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypeimagedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypeimagedatadir)/$$f'"; \
+ $(mimetypeimagedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypeimagedatadir)/$$f"; \
+ done
+@@ -555,7 +552,7 @@
+ uninstall-mimetypeimagedataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypeimagedata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypeimagedatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypeimagedatadir)/$$f"; \
+ done
+@@ -619,7 +616,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -694,7 +691,7 @@
.NOEXPORT:
#>+ 2
@@ -21904,7 +61710,58 @@
docs-am:
--- mimetypes/inode/Makefile.in
+++ mimetypes/inode/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypeinodedatadir)"
+ mimetypeinodedataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypeinodedata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21914,7 +61771,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -483,7 +486,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -483,7 +479,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21923,7 +61805,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +524,9 @@
+@@ -521,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21935,9 +61817,87 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -540,7 +536,7 @@
+ test -z "$(mimetypeinodedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeinodedatadir)"
+ @list='$(mimetypeinodedata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypeinodedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypeinodedatadir)/$$f'"; \
+ $(mimetypeinodedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypeinodedatadir)/$$f"; \
+ done
+@@ -548,7 +544,7 @@
+ uninstall-mimetypeinodedataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypeinodedata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypeinodedatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypeinodedatadir)/$$f"; \
+ done
+@@ -612,7 +608,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- mimetypes/message/Makefile.in
+++ mimetypes/message/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypemessagedatadir)"
+ mimetypemessagedataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypemessagedata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21947,7 +61907,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -481,7 +477,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21956,7 +61941,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +522,9 @@
+@@ -519,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21968,9 +61953,87 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -538,7 +534,7 @@
+ test -z "$(mimetypemessagedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypemessagedatadir)"
+ @list='$(mimetypemessagedata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypemessagedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypemessagedatadir)/$$f'"; \
+ $(mimetypemessagedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypemessagedatadir)/$$f"; \
+ done
+@@ -546,7 +542,7 @@
+ uninstall-mimetypemessagedataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypemessagedata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypemessagedatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypemessagedatadir)/$$f"; \
+ done
+@@ -610,7 +606,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- mimetypes/model/Makefile.in
+++ mimetypes/model/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypemessagedatadir)"
+ mimetypemessagedataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypemessagedata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -21980,7 +62043,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -481,7 +477,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -21989,7 +62077,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +522,9 @@
+@@ -519,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22001,9 +62089,87 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -538,7 +534,7 @@
+ test -z "$(mimetypemessagedatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypemessagedatadir)"
+ @list='$(mimetypemessagedata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypemessagedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypemessagedatadir)/$$f'"; \
+ $(mimetypemessagedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypemessagedatadir)/$$f"; \
+ done
+@@ -546,7 +542,7 @@
+ uninstall-mimetypemessagedataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypemessagedata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypemessagedatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypemessagedatadir)/$$f"; \
+ done
+@@ -610,7 +606,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- mimetypes/multipart/Makefile.in
+++ mimetypes/multipart/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypemultipartdatadir)"
+ mimetypemultipartdataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypemultipartdata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -22013,7 +62179,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -481,7 +477,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22022,7 +62213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +522,9 @@
+@@ -519,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22034,9 +62225,87 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -538,7 +534,7 @@
+ test -z "$(mimetypemultipartdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypemultipartdatadir)"
+ @list='$(mimetypemultipartdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypemultipartdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypemultipartdatadir)/$$f'"; \
+ $(mimetypemultipartdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypemultipartdatadir)/$$f"; \
+ done
+@@ -546,7 +542,7 @@
+ uninstall-mimetypemultipartdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypemultipartdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypemultipartdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypemultipartdatadir)/$$f"; \
+ done
+@@ -610,7 +606,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- mimetypes/text/Makefile.in
+++ mimetypes/text/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypetextdatadir)"
+ mimetypetextdataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypetextdata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -22046,7 +62315,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,7 +492,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -489,7 +485,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22055,7 +62349,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +530,9 @@
+@@ -527,9 +523,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22067,7 +62361,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -695,7 +698,7 @@
+@@ -546,7 +542,7 @@
+ test -z "$(mimetypetextdatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypetextdatadir)"
+ @list='$(mimetypetextdata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypetextdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypetextdatadir)/$$f'"; \
+ $(mimetypetextdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypetextdatadir)/$$f"; \
+ done
+@@ -554,7 +550,7 @@
+ uninstall-mimetypetextdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypetextdata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypetextdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypetextdatadir)/$$f"; \
+ done
+@@ -618,7 +614,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -695,7 +691,7 @@
.NOEXPORT:
#>+ 2
@@ -22078,7 +62399,58 @@
docs-am:
--- mimetypes/uri/Makefile.in
+++ mimetypes/uri/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypeuridatadir)"
+ mimetypeuridataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypeuridata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -22088,7 +62460,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -481,7 +477,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22097,7 +62494,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +522,9 @@
+@@ -519,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22109,9 +62506,87 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -538,7 +534,7 @@
+ test -z "$(mimetypeuridatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypeuridatadir)"
+ @list='$(mimetypeuridata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypeuridataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypeuridatadir)/$$f'"; \
+ $(mimetypeuridataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypeuridatadir)/$$f"; \
+ done
+@@ -546,7 +542,7 @@
+ uninstall-mimetypeuridataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypeuridata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypeuridatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypeuridatadir)/$$f"; \
+ done
+@@ -610,7 +606,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- mimetypes/video/Makefile.in
+++ mimetypes/video/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(mimetypevideodatadir)"
+ mimetypevideodataDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(mimetypevideodata_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -22121,7 +62596,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -485,7 +481,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22130,7 +62630,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -523,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22142,9 +62642,117 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -542,7 +538,7 @@
+ test -z "$(mimetypevideodatadir)" || $(mkdir_p) "$(DESTDIR)$(mimetypevideodatadir)"
+ @list='$(mimetypevideodata_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(mimetypevideodataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimetypevideodatadir)/$$f'"; \
+ $(mimetypevideodataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimetypevideodatadir)/$$f"; \
+ done
+@@ -550,7 +546,7 @@
+ uninstall-mimetypevideodataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(mimetypevideodata_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(mimetypevideodatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(mimetypevideodatadir)/$$f"; \
+ done
+@@ -614,7 +610,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- pics/Makefile.in
+++ pics/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,6 +15,8 @@
+
+ @SET_MAKE@
+
++SOURCES = $(ksvgtopng_SOURCES)
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -67,24 +69,27 @@
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
++#>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/ksvgtopng.Po
++#>+ 1
++ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ksvgtopng.Po
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++#>- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
++ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ksvgtopng_SOURCES)
+ DIST_SOURCES = $(ksvgtopng_SOURCES)
+ #>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -118,6 +123,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -159,8 +166,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -237,7 +242,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -274,6 +278,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -22154,7 +62762,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -329,6 +336,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -338,8 +346,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -357,6 +363,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -525,7 +532,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22163,7 +62796,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -563,9 +570,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22175,7 +62808,114 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -925,7 +928,7 @@
+@@ -611,21 +618,24 @@
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+ @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+ @am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ mostlyclean-libtool:
+@@ -645,13 +655,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -663,7 +667,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -671,13 +675,7 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -698,7 +696,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -797,17 +795,15 @@
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || mkdir "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="../$(top_distdir)" \
++ distdir="../$(distdir)/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -839,7 +835,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -925,7 +921,7 @@
.NOEXPORT:
#>+ 2
@@ -22186,7 +62926,58 @@
docs-am:
--- pics/crystalsvg/Makefile.in
+++ pics/crystalsvg/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(crystaldir)"
+ crystalDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(crystal_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -22196,7 +62987,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -481,7 +484,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -481,7 +477,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22205,7 +63021,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +522,9 @@
+@@ -519,9 +515,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22217,7 +63033,34 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -702,3886 +705,3886 @@
+@@ -538,7 +534,7 @@
+ test -z "$(crystaldir)" || $(mkdir_p) "$(DESTDIR)$(crystaldir)"
+ @list='$(crystal_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(crystalDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(crystaldir)/$$f'"; \
+ $(crystalDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(crystaldir)/$$f"; \
+ done
+@@ -546,7 +542,7 @@
+ uninstall-crystalDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(crystal_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(crystaldir)/$$f'"; \
+ rm -f "$(DESTDIR)$(crystaldir)/$$f"; \
+ done
+@@ -610,7 +606,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -702,3886 +698,3886 @@
.NOEXPORT:
#>+ 2
@@ -23491,6 +64334,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_green_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green_open.png
+ $(INSTALL_DATA) $(srcdir)/crsc-mime-karbon_karbon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/karbon_karbon.svgz
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-sound.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/sound.png
++ $(INSTALL_DATA) $(srcdir)/cr64-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+ $(INSTALL_DATA) $(srcdir)/cr128-mime-log.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-tex.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tex.png
+ $(INSTALL_DATA) $(srcdir)/cr128-filesys-network_local.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
@@ -23622,7 +64466,6 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-action-unindent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
+ $(INSTALL_DATA) $(srcdir)/cr128-device-smart_media_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_unmount.png
+ $(INSTALL_DATA) $(srcdir)/cr22-filesys-folder_yellow_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-mime-pk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+ $(INSTALL_DATA) $(srcdir)/cr48-mime-kword_kwd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
+ $(INSTALL_DATA) $(srcdir)/cr32-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-2rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
@@ -23724,6 +64567,7 @@
+ $(INSTALL_DATA) $(srcdir)/crsc-mime-exec_wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/exec_wine.svgz
+ $(INSTALL_DATA) $(srcdir)/cr22-action-pencil.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
+ $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
++ $(INSTALL_DATA) $(srcdir)/cr32-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
$(INSTALL_DATA) $(srcdir)/cr16-filesys-ftp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
- $(INSTALL_DATA) $(srcdir)/cr48-filesys-exec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
- $(INSTALL_DATA) $(srcdir)/cr48-mime-man.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/man.png
@@ -24033,7 +64877,6 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-device-compact_flash_mount.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_mount.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-airbrush.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/airbrush.png
+ $(INSTALL_DATA) $(srcdir)/cr64-filesys-folder_man.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_man.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-redo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/redo.png
+ $(INSTALL_DATA) $(srcdir)/cr64-device-print_class.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/print_class.png
+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_orange_open.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange_open.png
@@ -24532,6 +65375,7 @@
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-metafont.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
+ $(INSTALL_DATA) $(srcdir)/cr128-mime-font_bitmap.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
+ $(INSTALL_DATA) $(srcdir)/cr32-filesys-folder_print.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_print.png
++ $(INSTALL_DATA) $(srcdir)/cr48-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
+ $(INSTALL_DATA) $(srcdir)/cr128-filesys-folder_yellow.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-stamp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stamp.png
+ $(INSTALL_DATA) $(srcdir)/cr16-device-usbpendrive_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_unmount.png
@@ -24775,9 +65619,9 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-action-mail_post_to.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_post_to.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-mail_send.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_send.png
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-font.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font.png
++ $(INSTALL_DATA) $(srcdir)/cr128-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-source_o.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_o.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-source_p.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-mime-ascii.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
+ $(INSTALL_DATA) $(srcdir)/cr48-mime-widget_doc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-stop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
+ $(INSTALL_DATA) $(srcdir)/cr64-mime-source_s.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
@@ -25073,7 +65917,6 @@
+ $(INSTALL_DATA) $(srcdir)/cr32-action-connect_creating.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_creating.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bookmark.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-math_matrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-run.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
+ $(INSTALL_DATA) $(srcdir)/crsc-device-smartmedia_mount.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
+ $(INSTALL_DATA) $(srcdir)/crsc-mime-resource.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/resource.svgz
@@ -25125,8 +65968,8 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-action-exit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_green.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-down.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
++ $(INSTALL_DATA) $(srcdir)/cr32-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+ $(INSTALL_DATA) $(srcdir)/cr16-filesys-folder_video.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_video.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-device-zip_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-1rightarrow.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1rightarrow.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-math_onetwomatrix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
+ $(INSTALL_DATA) $(srcdir)/cr128-mime-source_f.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
@@ -25789,6 +66632,7 @@
+ $(INSTALL_DATA) $(srcdir)/crsc-action-exit.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
+ $(INSTALL_DATA) $(srcdir)/cr22-action-rightjust.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
+ $(INSTALL_DATA) $(srcdir)/cr48-mime-spreadsheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
++ $(INSTALL_DATA) $(srcdir)/cr16-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-source_c.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_c.png
+ $(INSTALL_DATA) $(srcdir)/cr16-mime-core.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-fileclose.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
@@ -26299,6 +67143,257 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/empty.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_important.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/compfile.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/pipe.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/contents2.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/joystick.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/resource.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/readme.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/quicktime.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_outbox.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_end.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_new.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_warning.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/exec_wine.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exec.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kugar_kud.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/lock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_no.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brace.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mouse.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/start.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_left.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/image.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_sidetree.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/switchuser.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/zip.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/run.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bild.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1downarrow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_right.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/empty.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/recycled.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/gf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_playlist.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/lock.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_prod.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/video.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/thumbnail.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_html.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/up.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filenew.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/recycled.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/gf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kexi_kexi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_unmount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/unknown.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sqrt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_edit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload_page.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/share.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gettext.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_forward.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/applix.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/favorites.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/unknown.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/revert.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_unmount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/zip.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tgz.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gear.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/queue.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editpaste.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_mount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_tar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload3.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/clear_left.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/lock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_established.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/binary.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/print_class.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/core.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/resource.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bottom.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editdelete.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/template_source.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/ascii.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/deb.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/services.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/exec.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag+.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_lsub.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filefind.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileexport.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kmultiple.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_query.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/blend.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pk.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/koffice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_nofullscreen.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/redo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_video.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/sound.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/project_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_man.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_blue.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/rpm.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_mount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_delete.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kivio_flw.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/info.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_detailed.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replyall.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsup.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/recycled.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tablet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/koffice.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorpicker.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_quarternote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/desktop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/applix.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/indent.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/apply.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdtrack.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cross.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_h.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_unmount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/misc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_tree.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/postscript.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_rew.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/compfile.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/message.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_print.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_halfnote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdimage.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_multicolumn.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/link_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/server.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/file_broken.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mouse.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/sound.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_java.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/password.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/system.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_o.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/locationbar_erase.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/desktop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filenew.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_crystal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_full.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_line.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_type1.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_p.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/translate.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_video.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/unknown.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_super.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kchart_chrt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kword_kwd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_play.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_f.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red_open.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/core.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileimport.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_cpp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_full.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/colorscm.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/dvi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/image.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde1.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/chardevice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/netscape_doc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/karbon_karbon.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/network.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kugar_kud.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_sub.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tablet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/print_class.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_choose.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/man.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_crystal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/html.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange_open.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/krita_kra.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_s.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_h.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_center.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kformula_kfo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/recycled.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/deb.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_strike.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/system.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editclear.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_important.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/pipe.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filenew.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmagfit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_type1.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/system.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizeup.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag+.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_txt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kchart_chrt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-news_subscribe.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/news_subscribe.png
+ $(INSTALL_DATA) $(srcdir)/crsc-filesys-zip_overlay.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/zip_overlay.svgz
+ $(INSTALL_DATA) $(srcdir)/cr16-action-view_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_bottom.png
@@ -26398,7 +67493,6 @@
+ $(INSTALL_DATA) $(srcdir)/cr48-device-joystick.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
+ $(INSTALL_DATA) $(srcdir)/cr128-filesys-trashcan_full.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
+ $(INSTALL_DATA) $(srcdir)/cr16-device-nfs_unmount.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-mime-gf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-gohome.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gohome.png
+ $(INSTALL_DATA) $(srcdir)/cr48-device-tablet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tablet.png
+ $(INSTALL_DATA) $(srcdir)/cr32-mime-empty.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/empty.png
@@ -26529,31 +67623,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/ok.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pk.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/crop.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/pipe.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/contents2.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/joystick.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/resource.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/readme.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/quicktime.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/mo_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_outbox.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_end.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/mail_new.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_warning.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/exec_wine.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/exec.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kugar_kud.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/lock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/connect_no.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brace.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mouse.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/start.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_left.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/image.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/pipe.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/mozilla_doc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/soffice.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/5floppy_unmount.png
@@ -26561,97 +67631,10 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rotate.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/shellscript.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kpresenter_kpr.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/usbpendrive_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_sidetree.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/switchuser.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/zip.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/run.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_bild.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1downarrow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_right.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/empty.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/recycled.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/gf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_playlist.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/lock.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_prod.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/video.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/thumbnail.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_html.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/up.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filenew.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/recycled.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/gf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kexi_kexi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/hdd_unmount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/unknown.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_sqrt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_edit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/reload_page.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/share.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gettext.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_forward.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/applix.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/favorites.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/unknown.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/revert.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kpresenter_kpr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_unmount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/zip.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tgz.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gear.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/queue.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_l.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editpaste.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/ipod_mount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_tar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload3.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/clear_left.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/lock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_established.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/binary.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/print_class.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/core.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/resource.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bottom.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/editdelete.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_open.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_new_raised.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/printer1.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/template_source.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/ascii.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/deb.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/pk.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/services.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/exec.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/hdd_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag+.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_lsub.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/filefind.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileexport.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kmultiple.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_query.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/blend.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/pk.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/koffice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/window_nofullscreen.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/template_source.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_left.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_moc.png
@@ -26669,19 +67652,18 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/karbon_karbon.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gettext.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorize.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/redo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_video.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/sound.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/project_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_man.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/pda_blue.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_bottom.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/rpm.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_mount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_delete.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_generic.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/redo.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_generic.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/zip.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/exec_wine.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/info.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/today.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/txt2.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_rew.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/key_enter.png
@@ -26694,7 +67676,103 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network_local.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmenu.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/html.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cross.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cross.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/shellscript.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_ccw.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/down.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/midi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_block.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/leftjust.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/signature.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_java.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_moc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/desktop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_y.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network_local.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/scanner.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_matrix.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_p.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_image.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kmultiple.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/netscape_doc.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_natur.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorize.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replylist.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kexi_kexi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_toolbar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unlock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/quicktime.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/switchuser.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcalendar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/lock_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcard.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gettext.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/blockdevice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/make_kdevelop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_italic.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/launch.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pdf.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_locked.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kivio_flw.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_favorite.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_text.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cleficon.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/wordprocessing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_bold.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pdf.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/html.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2leftarrow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/wizard.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/key_enter.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/printer1.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_mount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_umount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_fwd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/encrypted.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/sound.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/idea.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/zip_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_truetype.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/shellscript.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdr.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/misc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/man.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_subscribe.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_violet_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag-.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow_open.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/chardevice.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_icon.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_right.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/usbpendrive_unmount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filter.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/centrejust.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsub.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editcopy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure_toolbars.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/apply.png
@@ -26705,7 +67783,14 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/trashcan_full.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/video.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_orange_open.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red_open.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_py.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizedown.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_eightnote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/printer1.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_sub.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/system.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdrom_unmount.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_table.png
@@ -26725,21 +67810,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_folder.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/colorscm.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/identity.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kivio_flw.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/info.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_detailed.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replyall.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsup.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/recycled.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tablet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_red.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/koffice.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/ipod_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/colorpicker.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_quarternote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/desktop.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kivio_flw.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/document.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_right.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/edittrash.png
@@ -26763,19 +67834,17 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcalendar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/cdr.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pk.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/applix.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/indent.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/pdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/apply.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/camera_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/cdtrack.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cross.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_h.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/3floppy_unmount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/nfs_mount.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/applix.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/metafont.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/encrypted.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/encrypted.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_y.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vectorgfx.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_quarternote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/unknown.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_print.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_quarternote.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kchart_chrt.png
@@ -26809,11 +67878,36 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/metafont.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/camera_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/thumbnail.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents2.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_php.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/eraser.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tv.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_tar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/halfencrypted.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_fill.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/print_class.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_j.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/rpm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/message.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_reply.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filequickprint.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_post_to.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emptytrash.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/encrypted.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_locked.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/dvi.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/dvi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/password.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/hdd_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/info.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/spreadsheet.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_onetwomatrix.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/tv.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_py.png
@@ -26847,10 +67941,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/pipe.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/network.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_sound.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/misc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_tree.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/postscript.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_rew.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/misc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileprint.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/message.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_html.png
@@ -26859,58 +67950,38 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_matrix.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/font_bitmap.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/compfile.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/message.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_print.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_halfnote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdimage.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_multicolumn.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/link_overlay.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/server.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/file_broken.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mouse.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/sound.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_java.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/password.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/system.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_o.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/locationbar_erase.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/desktop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/filenew.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_violet_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_crystal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/trashcan_full.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/color_line.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/wordprocessing.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/font_type1.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_p.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/translate.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_video.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/unknown.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_super.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kchart_chrt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kword_kwd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/player_play.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_f.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_red_open.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/sd_mmc_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/core.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileimport.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_cpp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/trashcan_full.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/dvd_mount.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/compfile.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_yellow_open.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_cpp.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmagfit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/1rightarrow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_locked.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/undo.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/zip_overlay.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/zip_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/locationbar_erase.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/find.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/spellcheck.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_find.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_new.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_py.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/misc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_natur.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/inline_table.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/fileopen.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/man.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/man.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tex.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/desktop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt2.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_cpp.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileopen.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kugardata.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/memory_stick_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/dvi.png
@@ -26928,7 +67999,29 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorpicker.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kugar_kud.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_image.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2downarrow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2downarrow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_rew.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_quarternote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replylist.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editshred.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_italic.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/www.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_play.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/compact_flash_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_paren.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_c.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tgz.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_grey_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorize.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rebuild.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/back.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mouse.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/colorscm.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde3.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_right.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/encrypted.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_grey.png
@@ -26936,7 +68029,19 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_f.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/ascii.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/mozilla_doc.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_multicolumn.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/image.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/undo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_black.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileimport.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/locationbar_erase.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/wizard.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdimage.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_h.png
@@ -26967,15 +68072,59 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_lsup.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rotate.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/frame_formula.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/ok.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kpresenter_kpr.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_image.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/next.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cleficon.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/spreadsheet.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/toggle_log.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/scanner.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/printer1.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/services.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/video.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/charset.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kformula_kfo.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/make_kdevelop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/wizard.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_h.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home2.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcalendar.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag-.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileclose.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_temporary.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/karbon_karbon.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rightjust.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/www.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/identity.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdimage.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/template_source.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/dvi.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/message.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kmenu.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_s.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_sidetree.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/colorscm.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/dvi.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_sidetree.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_unmount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/colorscm.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/rpm.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/gear.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_green.png
@@ -26993,7 +68142,9 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_y.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_image.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/recycled.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/recycled.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fork.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/ascii.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/exec_wine.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/metafont.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/services.png
@@ -27002,25 +68153,11 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_super.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_violet_open.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/man.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/image.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_home.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_grey_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde1.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/chardevice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/netscape_doc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/karbon_karbon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/network.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kugar_kud.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_sub.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/tablet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/print_class.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_choose.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/image.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag-.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_truetype.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_sixteenthnote.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_blue.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_blue.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/forward.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editpaste.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdimage.svgz
@@ -27036,7 +68173,15 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/save_all.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/charset.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/encrypted.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/readme.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/readme.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/forward.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_eject.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/empty.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/print_class.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brackets.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/up.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_java.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_orange.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/sd_mmc_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_important.png
@@ -27126,19 +68271,9 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_send.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_p.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/decrypted.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/man.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/zip_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/compact_flash_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/txt2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_crystal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/html.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_orange_open.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/man.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/sd_mmc_mount.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/krita_kra.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/image.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_s.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_h.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/krita_kra.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_s.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tv.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
@@ -27149,77 +68284,13 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fork.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_tar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/file_important.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_center.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kformula_kfo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/recycled.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/deb.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/text_strike.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/system.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_man.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editclear.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_important.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/pipe.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filenew.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmagfit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/3floppy_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/font_type1.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/system.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/exit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fontsizeup.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_red.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag+.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/5floppy_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_txt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kchart_chrt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_generic.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/zip.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/vcard.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/exec_wine.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/finish.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/info.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/today.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_frac.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/camera_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_cross.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_home.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/shellscript.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_ccw.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/down.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/midi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_block.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/leftjust.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/signature.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_java.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/ipod_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/compact_flash_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_moc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/desktop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_center.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_reply.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_end.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_orange_open.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/mo_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_playlist.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_y.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/network_local.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/scanner.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/tv.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_matrix.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_orange.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/document.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_p.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_image.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_violet_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/font.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kmultiple.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/netscape_doc.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_natur.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_y.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/dvd_mount.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/eraser.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/recycled.png
@@ -27229,69 +68300,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_man.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mouse.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/print_class.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorize.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/eraser.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_replylist.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kexi_kexi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark_toolbar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unlock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/quicktime.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/switchuser.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vcalendar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/lock_overlay.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/vcard.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gettext.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/blockdevice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/make_kdevelop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_italic.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/launch.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/pdf.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_locked.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kivio_flw.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_favorite.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_text.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/cdrom_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_cleficon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/wordprocessing.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_bold.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/pdf.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/html.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2leftarrow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/wizard.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/key_enter.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/printer1.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/5floppy_mount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/mo_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/mo_umount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/sd_mmc_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_fwd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/encrypted.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/sound.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/idea.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/zip_overlay.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/camera_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_truetype.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/sd_mmc_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/shellscript.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdr.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/misc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/man.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/news_subscribe.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_violet_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag-.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/folder_yellow_open.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/chardevice.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_icon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/configure.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_right.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/usbpendrive_unmount.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/colorize.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/switchuser.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/idea.png
@@ -27326,71 +68335,14 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/deb.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/editcopy.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/remove.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filter.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/centrejust.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_rsub.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_red_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_py.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fontsizedown.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_eightnote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/cdwriter_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/printer1.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_sub.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/system.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/encrypted.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/txt.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_y.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/filter.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmark.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tar.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/vectorgfx.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_quarternote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_green.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/unknown.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/contents2.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_php.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/eraser.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tv.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_tar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/halfencrypted.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/color_fill.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/cdr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/print_class.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/compact_flash_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/usbpendrive_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_j.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/rpm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/message.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_reply.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/filequickprint.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/mail_post_to.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/emptytrash.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/dvi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/reload.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/password.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/hdd_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/info.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/spreadsheet.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/3floppy_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/zip_overlay.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/locationbar_erase.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_yellow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/find.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/spellcheck.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdaudio_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_find.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/window_new.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_py.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/misc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_natur.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green_open.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/karbon_karbon.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/sound.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/log.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/tex.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/network_local.png
@@ -27413,9 +68365,21 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/widget_doc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unlock.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/file_temporary.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_c.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_c.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gohome.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/text_under.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_playlist.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_playlist.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_crystal.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/man.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/save_all.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/make.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/lock.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_cw.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_post_to.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/colorscm.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/down.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/source_cpp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/txt2.png
@@ -27449,7 +68413,6 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/unindent.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/smart_media_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_yellow_open.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/pk.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/kword_kwd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_o.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/2rightarrow.png
@@ -27461,7 +68424,24 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_outbox.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload_page.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/memory_stick_mount.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_s.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_s.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_block.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmarks_list_add.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/log.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/wordprocessing.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/zip_overlay.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/finish.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdtrack.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/goto.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_mount.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_frac.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vectorgfx.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_halfnote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_play.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/toggle_log.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_get.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/clear_left.png
@@ -27477,7 +68457,8 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/find.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/launch.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/view_multicolumn.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_table.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_y.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sent_mail.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/vectorgfx.png
@@ -27508,38 +68489,14 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/exec_wine.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/pencil.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/exec.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/man.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/ftp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/mail_new.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/reload.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/system.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_italic.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_violet_open.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tex.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/desktop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/txt2.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_cpp.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileopen.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/kugardata.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/2downarrow.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_grey.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_rew.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_quarternote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_replylist.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editshred.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_italic.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/www.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/player_play.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/compact_flash_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_paren.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_c.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tgz.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_grey_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/colorize.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/tex.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark_folder.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mail_post_to3.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/spellcheck.png
@@ -27554,54 +68511,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/hdd_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kspread_ksp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/document.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rebuild.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/back.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_o.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/mouse.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/colorscm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde3.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/memory_stick_unmount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/usbpendrive_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/mozilla_doc.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/ipod_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_multicolumn.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/3floppy_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/image.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/undo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/pda_black.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/fileimport.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/locationbar_erase.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_dottednote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/ok.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/memory_stick_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kpresenter_kpr.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_image.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/next.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/cdrom_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/music_cleficon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/spreadsheet.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/toggle_log.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/scanner.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/edit.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/rotate.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/printer1.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/services.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/tab_remove.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/video.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_sound.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/charset.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmenu.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/camera_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/kformula_kfo.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/make_kdevelop.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/tar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/wizard.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_h.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_home2.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rebuild.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/dvi.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/gear.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow_open.png
@@ -27622,63 +68532,15 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/mozilla_doc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mouse.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/exec.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_flat.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_flat.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_p.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fill.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload_page.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/zip_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_moc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/shellscript.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcalendar.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/viewmag-.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/fileclose.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/file_temporary.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder_grey_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/karbon_karbon.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/rightjust.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/www.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/identity.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/cdimage.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/template_source.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/dvi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_sidetree.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/camera_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/nfs_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/sd_mmc_unmount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/recycled.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fork.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/ascii.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/pda_blue.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/readme.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/forward.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/player_eject.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/empty.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/print_class.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_brackets.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/up.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/filesystems/folder.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_java.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_c.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/gohome.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/zip_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_playlist.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/filesystems/network.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_crystal.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/man.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/save_all.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/make.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/lock.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/rotate_cw.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/mail_post_to.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/colorscm.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/source_s.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/text_block.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/bookmarks_list_add.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/viewmag.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/log.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/wordprocessing.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/nfs_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/zip_overlay.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vcalendar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/desktop.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/centrejust.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/vcard.png
@@ -27742,23 +68604,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/zip.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_left_right.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/stop.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/finish.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/cdtrack.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/goto.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/cdwriter_mount.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_frac.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/vectorgfx.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_halfnote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/player_play.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/cdtrack.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/inline_table.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/music_flat.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/dvd_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_p.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fill.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/reload_page.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/usbpendrive_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/memory_stick_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/message.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/smart_media_unmount.png
@@ -27939,7 +68785,6 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/compact_flash_mount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/airbrush.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_man.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/gf.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/redo.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/deb.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/image.png
@@ -28263,6 +69108,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/metafont.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/font_bitmap.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_print.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_yellow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/stamp.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/usbpendrive_unmount.png
@@ -28403,9 +69249,9 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/koffice.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/font.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_o.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_p.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/ascii.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/widget_doc.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/stop.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_s.png
@@ -28481,7 +69327,6 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/button_ok.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/kword_kwd.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/share.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_sound.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/project_open.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder.png
@@ -28493,35 +69338,11 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/template_source.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/html.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/document2.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_formula.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/midi.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_f.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/quicktime.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/colorscm.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/today.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/password.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_tar.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/filesystems/folder_green.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/text_center.png
@@ -28551,7 +69372,33 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/messagebox_warning.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/memory_stick_unmount.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/view_left_right.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_yellow.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/source_j.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_orange_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/no.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/mo_mount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_formula.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/editpaste.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/midi.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/message.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_f.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/metafont.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/folder_grey.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/core.svgz
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_home.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/kde6.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/password.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/filesystems/folder_red_open.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/message.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_int.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/ipod_unmount.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/sound.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/music_sixteenthnote.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/print_class.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/password.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/connect_creating.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmenu.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/share.png
@@ -28565,7 +69412,6 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/connect_creating.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/bookmark.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/math_matrix.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/gf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/run.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/smartmedia_mount.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/resource.svgz
@@ -28578,7 +69424,6 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/exit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_green.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/down.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_video.png
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/zip_unmount.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/source_java.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/folder.png
@@ -28586,6 +69431,7 @@
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_inbox.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/document.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/add.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/filesystems/folder_video.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/1rightarrow.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/math_onetwomatrix.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/source_f.png
@@ -29262,6 +70108,7 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/exit.svgz
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/rightjust.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/spreadsheet.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/source_c.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/core.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/fileclose.png
@@ -29616,7 +70463,6 @@
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/joystick.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/filesystems/trashcan_full.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/nfs_unmount.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/gf.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/gohome.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/tablet.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/empty.png
@@ -29839,7 +70685,58 @@
force-reedit:
--- pics/emoticons/Makefile.in
+++ pics/emoticons/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(icondir)"
+ iconDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(icon_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -29849,7 +70746,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +483,7 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -480,7 +476,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -29858,7 +70780,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +521,9 @@
+@@ -518,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29870,9 +70792,87 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -537,7 +533,7 @@
+ test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
+ @list='$(icon_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
+ $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
+ done
+@@ -545,7 +541,7 @@
+ uninstall-iconDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(icon_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
+ rm -f "$(DESTDIR)$(icondir)/$$f"; \
+ done
+@@ -609,7 +605,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
--- pics/hicolor/Makefile.in
+++ pics/hicolor/Makefile.in
-@@ -234,6 +234,9 @@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -54,12 +54,6 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+ am__installdirs = "$(DESTDIR)$(hicolordir)"
+ hicolorDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(hicolor_DATA)
+@@ -78,6 +72,8 @@
+ AUTODIRS = @AUTODIRS@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
++AVAHI_CFLAGS = @AVAHI_CFLAGS@
++AVAHI_LIBS = @AVAHI_LIBS@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+@@ -119,8 +115,6 @@
+ GSSAPI_INCS = @GSSAPI_INCS@
+ GSSAPI_LIBS = @GSSAPI_LIBS@
+ GSSAPI_RPATH = @GSSAPI_RPATH@
+-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
+-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
+ HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
+ HAVE_MITSHM = @HAVE_MITSHM@
+ HAVE_SENDFILE = @HAVE_SENDFILE@
+@@ -197,7 +191,6 @@
+ LIBXSLT_RPATH = @LIBXSLT_RPATH@
+ LIBZ = @LIBZ@
+ LIB_CUPS = @LIB_CUPS@
+-LIB_DNSSD = @LIB_DNSSD@
+ LIB_EXR = @LIB_EXR@
+ LIB_IDN = @LIB_IDN@
+ LIB_JASPER = @LIB_JASPER@
+@@ -234,6 +227,9 @@
LUA = @LUA@
LUA_INCLUDES = @LUA_INCLUDES@
LUA_LIBS = @LUA_LIBS@
@@ -29882,7 +70882,32 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -475,13 +478,12 @@
+@@ -289,6 +285,7 @@
+ ac_ct_F77 = @ac_ct_F77@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
++ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+@@ -298,8 +295,6 @@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ arts_SUBDIR_included_FALSE = @arts_SUBDIR_included_FALSE@
+ arts_SUBDIR_included_TRUE = @arts_SUBDIR_included_TRUE@
+ bindir = @bindir@
+@@ -317,6 +312,7 @@
+ doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
+ doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
+ exec_prefix = @exec_prefix@
++have_pkg_config = @have_pkg_config@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+@@ -475,13 +471,12 @@
xdg_menudir = @xdg_menudir@
hicolordir = $(kde_icondir)/hicolor
hicolor_DATA = index.theme
@@ -29897,7 +70922,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -519,9 +521,9 @@
+@@ -519,9 +514,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29909,3 +70934,30 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -538,7 +533,7 @@
+ test -z "$(hicolordir)" || $(mkdir_p) "$(DESTDIR)$(hicolordir)"
+ @list='$(hicolor_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(hicolorDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(hicolordir)/$$f'"; \
+ $(hicolorDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(hicolordir)/$$f"; \
+ done
+@@ -546,7 +541,7 @@
+ uninstall-hicolorDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(hicolor_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f '$(DESTDIR)$(hicolordir)/$$f'"; \
+ rm -f "$(DESTDIR)$(hicolordir)/$$f"; \
+ done
+@@ -610,7 +605,7 @@
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
More information about the pkg-kde-commits
mailing list