[Pkg-kde-commits] rev 1465 - branches/kde-3.4.0/packages/kdelibs/debian/patches

Christopher Martin chrsmrtn-guest at costa.debian.org
Tue Aug 16 15:26:09 UTC 2005


Author: chrsmrtn-guest
Date: 2005-08-16 15:26:04 +0000 (Tue, 16 Aug 2005)
New Revision: 1465

Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
Log:
New buildprep.diff for kdelibs.


Modified: branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff	2005-08-16 15:25:18 UTC (rev 1464)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/98_buildprep.diff	2005-08-16 15:26:04 UTC (rev 1465)
@@ -1,6 +1,6 @@
 diff -Nru kdelibs-3.4.2.orig/acinclude.m4 kdelibs-3.4.2/acinclude.m4
---- kdelibs-3.4.2.orig/acinclude.m4	2005-07-20 21:15:17.000000000 +0000
-+++ kdelibs-3.4.2/acinclude.m4	2005-07-26 18:39:27.000000000 +0000
+--- kdelibs-3.4.2.orig/acinclude.m4	2005-07-20 17:15:17.000000000 -0400
++++ kdelibs-3.4.2/acinclude.m4	2005-08-16 10:53:45.000000000 -0400
 @@ -1688,15 +1688,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
@@ -1517,8 +1517,23 @@
  ])
  
 diff -Nru kdelibs-3.4.2.orig/aclocal.m4 kdelibs-3.4.2/aclocal.m4
---- kdelibs-3.4.2.orig/aclocal.m4	2005-07-20 21:16:07.000000000 +0000
-+++ kdelibs-3.4.2/aclocal.m4	2005-07-26 18:40:58.000000000 +0000
+--- kdelibs-3.4.2.orig/aclocal.m4	2005-07-20 17:16:07.000000000 -0400
++++ kdelibs-3.4.2/aclocal.m4	2005-08-16 10:54:13.000000000 -0400
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005  Free Software Foundation, Inc.
+@@ -28,7 +28,7 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-	 [AM_AUTOMAKE_VERSION([1.9.5])])
++	 [AM_AUTOMAKE_VERSION([1.9.6])])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
 @@ -501,6 +501,35 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
@@ -1556,9 +1571,24 @@
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 diff -Nru kdelibs-3.4.2.orig/arts/kde/Makefile.in kdelibs-3.4.2/arts/kde/Makefile.in
---- kdelibs-3.4.2.orig/arts/kde/Makefile.in	2005-07-20 21:20:03.000000000 +0000
-+++ kdelibs-3.4.2/arts/kde/Makefile.in	2005-07-26 18:49:31.535002912 +0000
-@@ -292,6 +292,9 @@
+--- kdelibs-3.4.2.orig/arts/kde/Makefile.in	2005-07-20 17:20:03.000000000 -0400
++++ kdelibs-3.4.2/arts/kde/Makefile.in	2005-08-16 10:58:18.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libartskde_la_SOURCES) $(kconverttest_SOURCES) $(kiotest_SOURCES) $(kiotestslow_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1568,7 +1598,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -563,7 +564,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -1577,7 +1607,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1589,7 +1619,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -982,18 +985,18 @@
+@@ -982,18 +983,18 @@
  mocs: kconverttest.moc
  
  #>+ 3
@@ -1614,7 +1644,7 @@
  
  #>+ 3
  kplayobjectcreator.moc: $(srcdir)/kplayobjectcreator.h
-@@ -1017,13 +1020,6 @@
+@@ -1017,13 +1018,6 @@
  mocs: kdatarequest_impl.moc
  
  #>+ 3
@@ -1628,7 +1658,7 @@
  kplayobject.moc: $(srcdir)/kplayobject.h
  	$(MOC) $(srcdir)/kplayobject.h -o kplayobject.moc
  
-@@ -1038,11 +1034,11 @@
+@@ -1038,11 +1032,11 @@
  mocs: kplayobjectfactory_p.moc
  
  #>+ 3
@@ -1643,7 +1673,7 @@
  
  #>+ 3
  kaudiorecordstream_p.moc: $(srcdir)/kaudiorecordstream_p.h
-@@ -1052,11 +1048,18 @@
+@@ -1052,11 +1046,18 @@
  mocs: kaudiorecordstream_p.moc
  
  #>+ 3
@@ -1664,7 +1694,7 @@
  
  #>+ 3
  clean-closures:
-@@ -1104,7 +1107,7 @@
+@@ -1104,7 +1105,7 @@
  
  
  #>+ 11
@@ -1673,7 +1703,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; \
-@@ -1116,7 +1119,7 @@
+@@ -1116,7 +1117,7 @@
  	rm -f libartskde_la.all_cc.final libartskde_la.all_cc.files
  
  #>+ 11
@@ -1683,9 +1713,37 @@
  	rm -f libartskde_la.all_cpp.files libartskde_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libartskde_la.all_cpp.final; \
 diff -Nru kdelibs-3.4.2.orig/arts/kde/mcop-dcop/Makefile.in kdelibs-3.4.2/arts/kde/mcop-dcop/Makefile.in
---- kdelibs-3.4.2.orig/arts/kde/mcop-dcop/Makefile.in	2005-07-20 21:20:03.000000000 +0000
-+++ kdelibs-3.4.2/arts/kde/mcop-dcop/Makefile.in	2005-07-26 18:49:31.635987560 +0000
-@@ -278,6 +278,9 @@
+--- kdelibs-3.4.2.orig/arts/kde/mcop-dcop/Makefile.in	2005-07-20 17:20:03.000000000 -0400
++++ kdelibs-3.4.2/arts/kde/mcop-dcop/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,10 +18,6 @@
+ 
+ 
+ 
+-#>- SOURCES = $(kmcop_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES) 
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -106,7 +102,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kmcop_la_SOURCES)
++#>- SOURCES = $(kmcop_la_SOURCES)
++#>+ 1
++SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES) 
+ #>- DIST_SOURCES = $(kmcop_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kmcop_la_SOURCES) $(kmcop_SOURCES) 
+@@ -278,6 +276,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1695,7 +1753,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -536,7 +537,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -1704,7 +1762,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -574,9 +575,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1717,9 +1775,24 @@
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/arts/knotify/Makefile.in kdelibs-3.4.2/arts/knotify/Makefile.in
---- kdelibs-3.4.2.orig/arts/knotify/Makefile.in	2005-07-20 21:20:03.000000000 +0000
-+++ kdelibs-3.4.2/arts/knotify/Makefile.in	2005-07-26 18:49:31.731972968 +0000
-@@ -273,6 +273,9 @@
+--- kdelibs-3.4.2.orig/arts/knotify/Makefile.in	2005-07-20 17:20:03.000000000 -0400
++++ kdelibs-3.4.2/arts/knotify/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(knotify_la_SOURCES) $(knotifytest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1729,7 +1802,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -528,7 +529,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -1738,7 +1811,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -566,9 +567,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1751,8 +1824,14 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/arts/Makefile.in kdelibs-3.4.2/arts/Makefile.in
---- kdelibs-3.4.2.orig/arts/Makefile.in	2005-07-20 21:20:03.000000000 +0000
-+++ kdelibs-3.4.2/arts/Makefile.in	2005-07-26 18:49:31.351030880 +0000
+--- kdelibs-3.4.2.orig/arts/Makefile.in	2005-07-20 17:20:03.000000000 -0400
++++ kdelibs-3.4.2/arts/Makefile.in	2005-08-16 10:58:18.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -232,6 +232,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -1794,9 +1873,24 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/arts/message/Makefile.in kdelibs-3.4.2/arts/message/Makefile.in
---- kdelibs-3.4.2.orig/arts/message/Makefile.in	2005-07-20 21:20:03.000000000 +0000
-+++ kdelibs-3.4.2/arts/message/Makefile.in	2005-07-26 18:49:31.767967496 +0000
-@@ -250,6 +250,9 @@
+--- kdelibs-3.4.2.orig/arts/message/Makefile.in	2005-07-20 17:20:03.000000000 -0400
++++ kdelibs-3.4.2/arts/message/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(artsmessage_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -250,6 +248,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1806,7 +1900,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -493,7 +494,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -1815,7 +1909,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -531,9 +532,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1828,8 +1922,8 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/config.h.in kdelibs-3.4.2/config.h.in
---- kdelibs-3.4.2.orig/config.h.in	2005-07-20 21:16:31.000000000 +0000
-+++ kdelibs-3.4.2/config.h.in	2005-07-26 18:41:30.000000000 +0000
+--- kdelibs-3.4.2.orig/config.h.in	2005-07-20 17:16:31.000000000 -0400
++++ kdelibs-3.4.2/config.h.in	2005-08-16 10:54:29.000000000 -0400
 @@ -1037,9 +1037,6 @@
  /* execprefix or NONE if not set, for libloading */
  #undef __KDE_EXECPREFIX
@@ -1841,8 +1935,8 @@
  #undef __PATH_SU
  
 diff -Nru kdelibs-3.4.2.orig/configure kdelibs-3.4.2/configure
---- kdelibs-3.4.2.orig/configure	2005-07-20 21:20:28.000000000 +0000
-+++ kdelibs-3.4.2/configure	2005-07-26 18:50:20.166609784 +0000
+--- kdelibs-3.4.2.orig/configure	2005-07-20 17:20:28.000000000 -0400
++++ kdelibs-3.4.2/configure	2005-08-16 10:58:58.000000000 -0400
 @@ -464,7 +464,7 @@
  # include <unistd.h>
  #endif"
@@ -2408,11 +2502,16 @@
    fi
  
  
-@@ -6803,290 +6619,6 @@
+@@ -6798,297 +6614,6 @@
  
-   if test "x$GXX" = "xyes"; then
-     kde_have_gcc_visibility=no
+ 
+ 
 -
+-
+-
+-  if test "x$GXX" = "xyes"; then
+-    kde_have_gcc_visibility=no
+-
 -echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
 -echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
 -kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
@@ -2696,10 +2795,12 @@
 -
 -fi
 -
-   fi
- 
+-  fi
+-
    case $enable_ltdl_convenience in
-@@ -7263,10 +6795,10 @@
+   no) { { echo "$as_me:$LINENO: error: this package needs a convenience libltdl" >&5
+ echo "$as_me: error: this package needs a convenience libltdl" >&2;}
+@@ -7263,10 +6788,10 @@
      fi
    done
  done
@@ -2711,7 +2812,7 @@
  echo "$as_me:$LINENO: result: $SED" >&5
  echo "${ECHO_T}$SED" >&6
  
-@@ -7500,31 +7032,23 @@
+@@ -7500,31 +7025,23 @@
    ;;
  
  cygwin*)
@@ -2751,7 +2852,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7563,42 +7087,21 @@
+@@ -7563,42 +7080,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -2801,7 +2902,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
-@@ -7627,9 +7130,6 @@
+@@ -7627,9 +7123,6 @@
    ;;
  
  osf3* | osf4* | osf5*)
@@ -2811,7 +2912,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7639,7 +7139,6 @@
+@@ -7639,7 +7132,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -2819,16 +2920,16 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7716,7 +7215,7 @@
+@@ -7716,7 +7208,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 7719 "configure"' > conftest.$ac_ext
-+  echo '#line 7218 "configure"' > conftest.$ac_ext
++  echo '#line 7211 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7761,12 +7260,11 @@
+@@ -7761,12 +7253,11 @@
    (exit $ac_status); }; then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
@@ -2842,7 +2943,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7778,7 +7276,6 @@
+@@ -7778,7 +7269,6 @@
        esac
        ;;
      *64-bit*)
@@ -2850,7 +2951,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7838,8 +7335,7 @@
+@@ -7838,8 +7328,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2860,7 +2961,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7914,8 +7410,7 @@
+@@ -7914,8 +7403,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2870,7 +2971,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8085,8 +7580,7 @@
+@@ -8085,8 +7573,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2880,7 +2981,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8153,8 +7647,7 @@
+@@ -8153,8 +7640,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2890,16 +2991,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8361,7 +7854,7 @@
+@@ -8361,7 +7847,7 @@
  
  
  # Provide some information about the compiler.
 -echo "$as_me:8364:" \
-+echo "$as_me:7857:" \
++echo "$as_me:7850:" \
       "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
-@@ -8407,8 +7900,7 @@
+@@ -8407,8 +7893,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2909,7 +3010,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8457,8 +7949,7 @@
+@@ -8457,8 +7942,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -2919,7 +3020,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8516,7 +8007,7 @@
+@@ -8516,7 +8000,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -2928,7 +3029,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8545,20 +8036,26 @@
+@@ -8545,20 +8029,26 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -2960,7 +3061,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.
-@@ -8626,7 +8123,7 @@
+@@ -8626,7 +8116,7 @@
    symcode='[BCDEGQRST]'
    ;;
  solaris* | sysv5*)
@@ -2969,7 +3070,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8644,7 +8141,7 @@
+@@ -8644,7 +8134,7 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2978,35 +3079,35 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -9393,11 +8890,11 @@
+@@ -9393,11 +8883,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9396: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8893: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8886: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9400: \$? = $ac_status" >&5
-+   echo "$as_me:8897: \$? = $ac_status" >&5
++   echo "$as_me:8890: \$? = $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
-@@ -9626,11 +9123,11 @@
+@@ -9626,11 +9116,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9629: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9126: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9119: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9633: \$? = $ac_status" >&5
-+   echo "$as_me:9130: \$? = $ac_status" >&5
++   echo "$as_me:9123: \$? = $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
-@@ -9677,13 +9174,6 @@
+@@ -9677,13 +9167,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -3020,21 +3121,21 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -9693,11 +9183,11 @@
+@@ -9693,11 +9176,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9696: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9186: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9179: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9700: \$? = $ac_status" >&5
-+   echo "$as_me:9190: \$? = $ac_status" >&5
++   echo "$as_me:9183: \$? = $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
-@@ -9707,8 +9197,11 @@
+@@ -9707,8 +9190,11 @@
       fi
     fi
     chmod u+w .
@@ -3048,7 +3149,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9836,7 +9329,7 @@
+@@ -9836,7 +9322,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -3057,7 +3158,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9846,13 +9339,13 @@
+@@ -9846,13 +9332,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'
@@ -3073,7 +3174,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
-@@ -9861,19 +9354,19 @@
+@@ -9861,19 +9347,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -3097,7 +3198,7 @@
        fi
        ;;
  
-@@ -9891,8 +9384,8 @@
+@@ -9891,8 +9377,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -3108,7 +3209,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9905,10 +9398,36 @@
+@@ -9905,10 +9391,36 @@
        hardcode_shlibpath_var=no
        ;;
  
@@ -3147,7 +3248,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9958,9 +9477,20 @@
+@@ -9958,9 +9470,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
@@ -3170,7 +3271,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -10006,21 +9536,22 @@
+@@ -10006,21 +9529,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -3198,7 +3299,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10044,8 +9575,7 @@
+@@ -10044,8 +9568,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3208,7 +3309,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10072,14 +9602,13 @@
+@@ -10072,14 +9595,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -3226,7 +3327,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10106,8 +9635,7 @@
+@@ -10106,8 +9628,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3236,7 +3337,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10145,7 +9673,7 @@
+@@ -10145,7 +9666,7 @@
  	  whole_archive_flag_spec=' '
  	  archive_cmds_need_lc=yes
  	  # This is similar to how AIX traditionally builds it's shared libraries.
@@ -3245,7 +3346,7 @@
  	fi
        fi
        ;;
-@@ -10168,13 +9696,13 @@
+@@ -10168,13 +9689,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -3262,7 +3363,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.
-@@ -10188,21 +9716,21 @@
+@@ -10188,21 +9709,21 @@
        archive_cmds_need_lc=no
        case "$host_os" in
        rhapsody* | darwin1.[012])
@@ -3297,7 +3398,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -10211,18 +9739,18 @@
+@@ -10211,18 +9732,18 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -3322,7 +3423,7 @@
        hardcode_direct=no
        hardcode_automatic=yes
        hardcode_shlibpath_var=unsupported
-@@ -10263,8 +9791,8 @@
+@@ -10263,8 +9784,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -3333,7 +3434,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10272,7 +9800,7 @@
+@@ -10272,7 +9793,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -3342,7 +3443,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
-@@ -10290,10 +9818,10 @@
+@@ -10290,10 +9811,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -3355,7 +3456,7 @@
  	  ;;
  	esac
        else
-@@ -10340,7 +9868,7 @@
+@@ -10340,7 +9861,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -3364,7 +3465,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'
-@@ -10350,7 +9878,7 @@
+@@ -10350,7 +9871,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -3373,7 +3474,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10373,7 +9901,7 @@
+@@ -10373,7 +9894,7 @@
        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
@@ -3382,7 +3483,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10383,7 +9911,7 @@
+@@ -10383,7 +9904,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -3391,7 +3492,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10394,14 +9922,14 @@
+@@ -10394,14 +9915,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -3408,7 +3509,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'
-@@ -10413,7 +9941,7 @@
+@@ -10413,7 +9934,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -3417,7 +3518,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag=' -expect_unresolved \*'
-@@ -10438,9 +9966,9 @@
+@@ -10438,9 +9959,9 @@
      solaris*)
        no_undefined_flag=' -z text'
        if test "$GCC" = yes; then
@@ -3429,7 +3530,7 @@
        else
  	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~
-@@ -10460,7 +9988,7 @@
+@@ -10460,7 +9981,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.
@@ -3438,7 +3539,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10520,9 +10048,9 @@
+@@ -10520,9 +10041,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -3450,7 +3551,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var=no
-@@ -10628,7 +10156,7 @@
+@@ -10628,7 +10149,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -3459,7 +3560,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10638,7 +10166,20 @@
+@@ -10638,7 +10159,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3481,7 +3582,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10703,7 +10244,7 @@
+@@ -10703,7 +10237,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -3490,7 +3591,7 @@
    ;;
  
  beos*)
-@@ -10728,7 +10269,7 @@
+@@ -10728,7 +10262,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -3499,7 +3600,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10793,7 +10334,7 @@
+@@ -10793,7 +10327,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -3508,7 +3609,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"`
-@@ -10816,7 +10357,7 @@
+@@ -10816,7 +10350,7 @@
    dynamic_linker=no
    ;;
  
@@ -3517,7 +3618,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10876,7 +10417,7 @@
+@@ -10876,7 +10410,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -3526,7 +3627,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10891,7 +10432,7 @@
+@@ -10891,7 +10425,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -3535,7 +3636,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10902,7 +10443,7 @@
+@@ -10902,7 +10436,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -3544,7 +3645,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10964,22 +10505,19 @@
+@@ -10964,22 +10498,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'
@@ -3573,7 +3674,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,
-@@ -10989,6 +10527,30 @@
+@@ -10989,6 +10520,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -3604,7 +3705,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10998,7 +10560,7 @@
+@@ -10998,7 +10553,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -3613,7 +3714,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -11027,7 +10589,7 @@
+@@ -11027,7 +10582,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -3622,7 +3723,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
-@@ -11047,7 +10609,7 @@
+@@ -11047,7 +10602,7 @@
  
  os2*)
    libname_spec='$name'
@@ -3631,7 +3732,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11276,8 +10838,7 @@
+@@ -11276,8 +10831,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3641,7 +3742,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11380,8 +10941,7 @@
+@@ -11380,8 +10934,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3651,7 +3752,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11446,8 +11006,7 @@
+@@ -11446,8 +10999,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3661,7 +3762,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11540,8 +11099,7 @@
+@@ -11540,8 +11092,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3671,7 +3772,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11606,8 +11164,7 @@
+@@ -11606,8 +11157,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3681,7 +3782,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11673,8 +11230,7 @@
+@@ -11673,8 +11223,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3691,7 +3792,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11740,8 +11296,7 @@
+@@ -11740,8 +11289,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3701,25 +3802,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11816,7 +11371,7 @@
+@@ -11816,7 +11364,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11819 "configure"
-+#line 11374 "configure"
++#line 11367 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11914,7 +11469,7 @@
+@@ -11914,7 +11462,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11917 "configure"
-+#line 11472 "configure"
++#line 11465 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12039,7 +11594,7 @@
+@@ -12039,7 +11587,7 @@
    fi
    ;;
  
@@ -3728,7 +3829,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -12049,29 +11604,29 @@
+@@ -12049,29 +11597,29 @@
      archive_cmds_need_lc=no
      case "$host_os" in
      rhapsody* | darwin1.[012])
@@ -3772,7 +3873,7 @@
      hardcode_direct=no
      hardcode_automatic=yes
      hardcode_shlibpath_var=unsupported
-@@ -12105,7 +11660,8 @@
+@@ -12105,7 +11653,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.
@@ -3782,7 +3883,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 \
-@@ -12283,7 +11839,7 @@
+@@ -12283,7 +11832,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -3791,7 +3892,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12314,7 +11870,7 @@
+@@ -12314,7 +11863,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -3800,7 +3901,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12556,7 +12112,10 @@
+@@ -12556,7 +12105,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.
@@ -3812,7 +3913,7 @@
  fi
  
  
-@@ -12824,8 +12383,8 @@
+@@ -12824,8 +12376,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
@@ -3823,7 +3924,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12851,7 +12410,7 @@
+@@ -12851,7 +12403,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.
@@ -3832,7 +3933,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12882,8 +12441,22 @@
+@@ -12882,8 +12434,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -3857,7 +3958,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12929,15 +12502,16 @@
+@@ -12929,15 +12495,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -3878,7 +3979,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.
-@@ -12967,8 +12541,7 @@
+@@ -12967,8 +12534,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3888,7 +3989,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12997,13 +12570,12 @@
+@@ -12997,13 +12563,12 @@
  
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -3904,7 +4005,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -13030,8 +12602,7 @@
+@@ -13030,8 +12595,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3914,7 +4015,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13069,7 +12640,7 @@
+@@ -13069,7 +12633,7 @@
  	whole_archive_flag_spec_CXX=' '
  	archive_cmds_need_lc_CXX=yes
  	# This is similar to how AIX traditionally builds it's shared libraries.
@@ -3923,7 +4024,7 @@
        fi
      fi
      ;;
-@@ -13086,12 +12657,12 @@
+@@ -13086,12 +12650,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
      # as there is no search path for DLLs.
      hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -3938,7 +4039,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
-@@ -13100,7 +12671,7 @@
+@@ -13100,7 +12664,7 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -3947,7 +4048,7 @@
      else
        ld_shlibs_CXX=no
      fi
-@@ -13111,20 +12682,20 @@
+@@ -13111,20 +12675,20 @@
      archive_cmds_need_lc_CXX=no
      case "$host_os" in
      rhapsody* | darwin1.[012])
@@ -3978,7 +4079,7 @@
        fi
        ;;
      esac
-@@ -13134,19 +12705,19 @@
+@@ -13134,19 +12698,19 @@
        lt_int_apple_cc_single_mod=yes
      fi
      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -4004,7 +4105,7 @@
      hardcode_direct_CXX=no
      hardcode_automatic_CXX=yes
      hardcode_shlibpath_var_CXX=unsupported
-@@ -13181,7 +12752,7 @@
+@@ -13181,7 +12745,7 @@
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
@@ -4013,7 +4114,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13203,7 +12774,7 @@
+@@ -13203,7 +12767,7 @@
        ld_shlibs_CXX=no
        ;;
      aCC)
@@ -4022,7 +4123,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13212,11 +12783,11 @@
+@@ -13212,11 +12776,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.
@@ -4036,7 +4137,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13273,7 +12844,7 @@
+@@ -13273,7 +12837,7 @@
  	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -4045,7 +4146,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13294,7 +12865,7 @@
+@@ -13294,7 +12858,7 @@
  	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -4054,7 +4155,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13309,7 +12880,7 @@
+@@ -13309,7 +12873,7 @@
      case $cc_basename in
        CC)
  	# SGI C++
@@ -4063,7 +4164,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13320,9 +12891,9 @@
+@@ -13320,9 +12884,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -4075,7 +4176,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13339,8 +12910,8 @@
+@@ -13339,8 +12903,8 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -4086,7 +4187,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13362,16 +12933,16 @@
+@@ -13362,16 +12926,16 @@
  	# Intel C++
  	with_gnu_ld=yes
  	archive_cmds_need_lc_CXX=no
@@ -4107,7 +4208,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13409,7 +12980,7 @@
+@@ -13409,7 +12973,7 @@
  	;;
      esac
      ;;
@@ -4116,7 +4217,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=
-@@ -13428,7 +12999,7 @@
+@@ -13428,7 +12992,7 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -4125,7 +4226,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13445,7 +13016,7 @@
+@@ -13445,7 +13009,7 @@
  	;;
        cxx)
  	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4134,7 +4235,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13463,7 +13034,7 @@
+@@ -13463,7 +13027,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4143,7 +4244,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13488,7 +13059,7 @@
+@@ -13488,7 +13052,7 @@
  	# KCC will only create a shared library if the output file
  	# ends with ".so" (or ".sl" for HP-UX), so rename the library
  	# to its proper name (with version) after linking.
@@ -4152,7 +4253,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13504,10 +13075,10 @@
+@@ -13504,10 +13068,10 @@
  	;;
        cxx)
  	allow_undefined_flag_CXX=' -expect_unresolved \*'
@@ -4165,7 +4266,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13526,7 +13097,7 @@
+@@ -13526,7 +13090,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -4174,7 +4275,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13583,9 +13154,9 @@
+@@ -13583,9 +13147,9 @@
        CC)
  	# Sun C++ 4.2, 5.x and Centerline C++
  	no_undefined_flag_CXX=' -zdefs'
@@ -4186,7 +4287,7 @@
  
  	hardcode_libdir_flag_spec_CXX='-R$libdir'
  	hardcode_shlibpath_var_CXX=no
-@@ -13619,7 +13190,7 @@
+@@ -13619,7 +13183,7 @@
  	;;
        gcx)
  	# Green Hills C++ Compiler
@@ -4195,7 +4296,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13629,9 +13200,9 @@
+@@ -13629,9 +13193,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
@@ -4207,7 +4308,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13640,9 +13211,9 @@
+@@ -13640,9 +13204,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -4219,7 +4320,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13757,7 +13328,7 @@
+@@ -13757,7 +13321,7 @@
         fi
         ;;
  
@@ -4228,7 +4329,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13892,7 +13463,7 @@
+@@ -13892,7 +13456,7 @@
  	    ;;
  	esac
  	;;
@@ -4237,7 +4338,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -13968,7 +13539,7 @@
+@@ -13968,7 +13532,7 @@
  	    ;;
  	esac
  	;;
@@ -4246,21 +4347,21 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -14079,11 +13650,11 @@
+@@ -14079,11 +13643,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14082: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13653: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13646: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14086: \$? = $ac_status" >&5
-+   echo "$as_me:13657: \$? = $ac_status" >&5
++   echo "$as_me:13650: \$? = $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
-@@ -14130,13 +13701,6 @@
+@@ -14130,13 +13694,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -4274,21 +4375,21 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -14146,11 +13710,11 @@
+@@ -14146,11 +13703,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14149: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13713: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13706: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14153: \$? = $ac_status" >&5
-+   echo "$as_me:13717: \$? = $ac_status" >&5
++   echo "$as_me:13710: \$? = $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
-@@ -14160,8 +13724,11 @@
+@@ -14160,8 +13717,11 @@
       fi
     fi
     chmod u+w .
@@ -4302,7 +4403,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -14213,6 +13780,9 @@
+@@ -14213,6 +13773,9 @@
    cygwin* | mingw*)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -4312,7 +4413,7 @@
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -14294,7 +13864,7 @@
+@@ -14294,7 +13857,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -4321,7 +4422,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14304,7 +13874,20 @@
+@@ -14304,7 +13867,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4343,7 +4444,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14369,7 +13952,7 @@
+@@ -14369,7 +13945,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -4352,7 +4453,7 @@
    ;;
  
  beos*)
-@@ -14394,7 +13977,7 @@
+@@ -14394,7 +13970,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -4361,7 +4462,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14459,7 +14042,7 @@
+@@ -14459,7 +14035,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -4370,7 +4471,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"`
-@@ -14482,7 +14065,7 @@
+@@ -14482,7 +14058,7 @@
    dynamic_linker=no
    ;;
  
@@ -4379,7 +4480,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14542,7 +14125,7 @@
+@@ -14542,7 +14118,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -4388,7 +4489,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14557,7 +14140,7 @@
+@@ -14557,7 +14133,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -4397,7 +4498,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14568,7 +14151,7 @@
+@@ -14568,7 +14144,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -4406,7 +4507,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14630,22 +14213,19 @@
+@@ -14630,22 +14206,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'
@@ -4435,7 +4536,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,
-@@ -14655,6 +14235,30 @@
+@@ -14655,6 +14228,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -4466,7 +4567,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14664,7 +14268,7 @@
+@@ -14664,7 +14261,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -4475,7 +4576,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14693,7 +14297,7 @@
+@@ -14693,7 +14290,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -4484,7 +4585,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
-@@ -14713,7 +14317,7 @@
+@@ -14713,7 +14310,7 @@
  
  os2*)
    libname_spec='$name'
@@ -4493,7 +4594,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14942,8 +14546,7 @@
+@@ -14942,8 +14539,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4503,7 +4604,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15046,8 +14649,7 @@
+@@ -15046,8 +14642,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4513,7 +4614,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15112,8 +14714,7 @@
+@@ -15112,8 +14707,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4523,7 +4624,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15206,8 +14807,7 @@
+@@ -15206,8 +14800,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4533,7 +4634,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15272,8 +14872,7 @@
+@@ -15272,8 +14865,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4543,7 +4644,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15339,8 +14938,7 @@
+@@ -15339,8 +14931,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4553,7 +4654,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15406,8 +15004,7 @@
+@@ -15406,8 +14997,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4563,25 +4664,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15482,7 +15079,7 @@
+@@ -15482,7 +15072,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 15485 "configure"
-+#line 15082 "configure"
++#line 15075 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15580,7 +15177,7 @@
+@@ -15580,7 +15170,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 15583 "configure"
-+#line 15180 "configure"
++#line 15173 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15697,7 +15294,8 @@
+@@ -15697,7 +15287,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.
@@ -4591,7 +4692,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 \
-@@ -15827,7 +15425,7 @@
+@@ -15827,7 +15418,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -4600,7 +4701,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -15858,7 +15456,7 @@
+@@ -15858,7 +15449,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -4609,7 +4710,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -16075,7 +15673,10 @@
+@@ -16075,7 +15666,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.
@@ -4621,7 +4722,7 @@
  fi
  
  
-@@ -16177,7 +15778,7 @@
+@@ -16177,7 +15771,7 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -4630,21 +4731,21 @@
    test "$enable_shared" = yes && enable_static=no
    ;;
  esac
-@@ -16403,11 +16004,11 @@
+@@ -16403,11 +15997,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16406: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16007: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16000: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16410: \$? = $ac_status" >&5
-+   echo "$as_me:16011: \$? = $ac_status" >&5
++   echo "$as_me:16004: \$? = $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
-@@ -16454,13 +16055,6 @@
+@@ -16454,13 +16048,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -4658,21 +4759,21 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -16470,11 +16064,11 @@
+@@ -16470,11 +16057,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16473: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16067: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16060: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16477: \$? = $ac_status" >&5
-+   echo "$as_me:16071: \$? = $ac_status" >&5
++   echo "$as_me:16064: \$? = $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
-@@ -16484,8 +16078,11 @@
+@@ -16484,8 +16071,11 @@
       fi
     fi
     chmod u+w .
@@ -4686,7 +4787,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16613,7 +16210,7 @@
+@@ -16613,7 +16203,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -4695,7 +4796,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16623,13 +16220,13 @@
+@@ -16623,13 +16213,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'
@@ -4711,7 +4812,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
-@@ -16638,19 +16235,19 @@
+@@ -16638,19 +16228,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -4735,7 +4836,7 @@
        fi
        ;;
  
-@@ -16668,8 +16265,8 @@
+@@ -16668,8 +16258,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4746,7 +4847,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16682,10 +16279,36 @@
+@@ -16682,10 +16272,36 @@
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -4785,7 +4886,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16735,9 +16358,20 @@
+@@ -16735,9 +16351,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
@@ -4808,7 +4909,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16783,21 +16417,22 @@
+@@ -16783,21 +16410,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -4836,7 +4937,7 @@
        program main
  
        end
-@@ -16811,8 +16446,7 @@
+@@ -16811,8 +16439,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4846,7 +4947,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16839,14 +16473,13 @@
+@@ -16839,14 +16466,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -4864,7 +4965,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16863,8 +16496,7 @@
+@@ -16863,8 +16489,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4874,7 +4975,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16902,7 +16534,7 @@
+@@ -16902,7 +16527,7 @@
  	  whole_archive_flag_spec_F77=' '
  	  archive_cmds_need_lc_F77=yes
  	  # This is similar to how AIX traditionally builds it's shared libraries.
@@ -4883,7 +4984,7 @@
  	fi
        fi
        ;;
-@@ -16925,13 +16557,13 @@
+@@ -16925,13 +16550,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -4900,7 +5001,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_F77='true'
        # FIXME: Should let the user specify the lib program.
-@@ -16945,21 +16577,21 @@
+@@ -16945,21 +16570,21 @@
        archive_cmds_need_lc_F77=no
        case "$host_os" in
        rhapsody* | darwin1.[012])
@@ -4935,7 +5036,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -16968,18 +16600,18 @@
+@@ -16968,18 +16593,18 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -4960,7 +5061,7 @@
        hardcode_direct_F77=no
        hardcode_automatic_F77=yes
        hardcode_shlibpath_var_F77=unsupported
-@@ -17020,8 +16652,8 @@
+@@ -17020,8 +16645,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -4971,7 +5072,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -17029,7 +16661,7 @@
+@@ -17029,7 +16654,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -4980,7 +5081,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
-@@ -17047,10 +16679,10 @@
+@@ -17047,10 +16672,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -4993,7 +5094,7 @@
  	  ;;
  	esac
        else
-@@ -17097,7 +16729,7 @@
+@@ -17097,7 +16722,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -5002,7 +5103,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'
-@@ -17107,7 +16739,7 @@
+@@ -17107,7 +16732,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -5011,7 +5112,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
-@@ -17130,7 +16762,7 @@
+@@ -17130,7 +16755,7 @@
        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
@@ -5020,7 +5121,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17140,7 +16772,7 @@
+@@ -17140,7 +16765,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -5029,7 +5130,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17151,14 +16783,14 @@
+@@ -17151,14 +16776,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -5046,7 +5147,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'
-@@ -17170,7 +16802,7 @@
+@@ -17170,7 +16795,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -5055,7 +5156,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -17195,9 +16827,9 @@
+@@ -17195,9 +16820,9 @@
      solaris*)
        no_undefined_flag_F77=' -z text'
        if test "$GCC" = yes; then
@@ -5067,7 +5168,7 @@
        else
  	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~
-@@ -17217,7 +16849,7 @@
+@@ -17217,7 +16842,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.
@@ -5076,7 +5177,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17277,9 +16909,9 @@
+@@ -17277,9 +16902,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_F77='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -5088,7 +5189,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_F77=no
-@@ -17385,7 +17017,7 @@
+@@ -17385,7 +17010,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -5097,7 +5198,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17395,7 +17027,20 @@
+@@ -17395,7 +17020,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5119,7 +5220,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17460,7 +17105,7 @@
+@@ -17460,7 +17098,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5128,7 +5229,7 @@
    ;;
  
  beos*)
-@@ -17485,7 +17130,7 @@
+@@ -17485,7 +17123,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -5137,7 +5238,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17550,7 +17195,7 @@
+@@ -17550,7 +17188,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -5146,7 +5247,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"`
-@@ -17573,7 +17218,7 @@
+@@ -17573,7 +17211,7 @@
    dynamic_linker=no
    ;;
  
@@ -5155,7 +5256,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17633,7 +17278,7 @@
+@@ -17633,7 +17271,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -5164,7 +5265,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17648,7 +17293,7 @@
+@@ -17648,7 +17286,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -5173,7 +5274,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17659,7 +17304,7 @@
+@@ -17659,7 +17297,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -5182,7 +5283,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17721,22 +17366,19 @@
+@@ -17721,22 +17359,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'
@@ -5211,7 +5312,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,
-@@ -17746,6 +17388,30 @@
+@@ -17746,6 +17381,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -5242,7 +5343,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17755,7 +17421,7 @@
+@@ -17755,7 +17414,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -5251,7 +5352,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17784,7 +17450,7 @@
+@@ -17784,7 +17443,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -5260,7 +5361,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
-@@ -17804,7 +17470,7 @@
+@@ -17804,7 +17463,7 @@
  
  os2*)
    libname_spec='$name'
@@ -5269,7 +5370,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17983,7 +17649,8 @@
+@@ -17983,7 +17642,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.
@@ -5279,7 +5380,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 \
-@@ -18113,7 +17780,7 @@
+@@ -18113,7 +17773,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -5288,7 +5389,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18144,7 +17811,7 @@
+@@ -18144,7 +17804,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -5297,7 +5398,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18361,7 +18028,10 @@
+@@ -18361,7 +18021,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.
@@ -5309,35 +5410,35 @@
  fi
  
  
-@@ -18443,11 +18113,11 @@
+@@ -18443,11 +18106,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18446: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18116: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18109: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18450: \$? = $ac_status" >&5
-+   echo "$as_me:18120: \$? = $ac_status" >&5
++   echo "$as_me:18113: \$? = $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
-@@ -18676,11 +18346,11 @@
+@@ -18676,11 +18339,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18679: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18349: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18342: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18683: \$? = $ac_status" >&5
-+   echo "$as_me:18353: \$? = $ac_status" >&5
++   echo "$as_me:18346: \$? = $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
-@@ -18727,13 +18397,6 @@
+@@ -18727,13 +18390,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -5351,21 +5452,21 @@
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -18743,11 +18406,11 @@
+@@ -18743,11 +18399,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18746: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18409: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18402: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:18750: \$? = $ac_status" >&5
-+   echo "$as_me:18413: \$? = $ac_status" >&5
++   echo "$as_me:18406: \$? = $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
-@@ -18757,8 +18420,11 @@
+@@ -18757,8 +18413,11 @@
       fi
     fi
     chmod u+w .
@@ -5379,7 +5480,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18886,7 +18552,7 @@
+@@ -18886,7 +18545,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -5388,7 +5489,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18896,13 +18562,13 @@
+@@ -18896,13 +18555,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'
@@ -5404,7 +5505,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
-@@ -18911,19 +18577,19 @@
+@@ -18911,19 +18570,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -5428,7 +5529,7 @@
        fi
        ;;
  
-@@ -18941,8 +18607,8 @@
+@@ -18941,8 +18600,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5439,7 +5540,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18955,10 +18621,36 @@
+@@ -18955,10 +18614,36 @@
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -5478,7 +5579,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -19008,9 +18700,20 @@
+@@ -19008,9 +18693,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
@@ -5501,7 +5602,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -19056,21 +18759,22 @@
+@@ -19056,21 +18752,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -5529,7 +5630,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19094,8 +18798,7 @@
+@@ -19094,8 +18791,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5539,7 +5640,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19122,14 +18825,13 @@
+@@ -19122,14 +18818,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -5557,7 +5658,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19156,8 +18858,7 @@
+@@ -19156,8 +18851,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5567,7 +5668,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19195,7 +18896,7 @@
+@@ -19195,7 +18889,7 @@
  	  whole_archive_flag_spec_GCJ=' '
  	  archive_cmds_need_lc_GCJ=yes
  	  # This is similar to how AIX traditionally builds it's shared libraries.
@@ -5576,7 +5677,7 @@
  	fi
        fi
        ;;
-@@ -19218,13 +18919,13 @@
+@@ -19218,13 +18912,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -5593,7 +5694,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_GCJ='true'
        # FIXME: Should let the user specify the lib program.
-@@ -19238,21 +18939,21 @@
+@@ -19238,21 +18932,21 @@
        archive_cmds_need_lc_GCJ=no
        case "$host_os" in
        rhapsody* | darwin1.[012])
@@ -5628,7 +5729,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -19261,18 +18962,18 @@
+@@ -19261,18 +18955,18 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -5653,7 +5754,7 @@
        hardcode_direct_GCJ=no
        hardcode_automatic_GCJ=yes
        hardcode_shlibpath_var_GCJ=unsupported
-@@ -19313,8 +19014,8 @@
+@@ -19313,8 +19007,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5664,7 +5765,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19322,7 +19023,7 @@
+@@ -19322,7 +19016,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -5673,7 +5774,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
-@@ -19340,10 +19041,10 @@
+@@ -19340,10 +19034,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -5686,7 +5787,7 @@
  	  ;;
  	esac
        else
-@@ -19390,7 +19091,7 @@
+@@ -19390,7 +19084,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -5695,7 +5796,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'
-@@ -19400,7 +19101,7 @@
+@@ -19400,7 +19094,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -5704,7 +5805,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
-@@ -19423,7 +19124,7 @@
+@@ -19423,7 +19117,7 @@
        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
@@ -5713,7 +5814,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19433,7 +19134,7 @@
+@@ -19433,7 +19127,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -5722,7 +5823,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19444,14 +19145,14 @@
+@@ -19444,14 +19138,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -5739,7 +5840,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'
-@@ -19463,7 +19164,7 @@
+@@ -19463,7 +19157,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -5748,7 +5849,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19488,9 +19189,9 @@
+@@ -19488,9 +19182,9 @@
      solaris*)
        no_undefined_flag_GCJ=' -z text'
        if test "$GCC" = yes; then
@@ -5760,7 +5861,7 @@
        else
  	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~
-@@ -19510,7 +19211,7 @@
+@@ -19510,7 +19204,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.
@@ -5769,7 +5870,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19570,9 +19271,9 @@
+@@ -19570,9 +19264,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_GCJ='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -5781,7 +5882,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_GCJ=no
-@@ -19678,7 +19379,7 @@
+@@ -19678,7 +19372,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -5790,7 +5891,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19688,7 +19389,20 @@
+@@ -19688,7 +19382,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5812,7 +5913,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19753,7 +19467,7 @@
+@@ -19753,7 +19460,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5821,7 +5922,7 @@
    ;;
  
  beos*)
-@@ -19778,7 +19492,7 @@
+@@ -19778,7 +19485,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -5830,7 +5931,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19843,7 +19557,7 @@
+@@ -19843,7 +19550,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -5839,7 +5940,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"`
-@@ -19866,7 +19580,7 @@
+@@ -19866,7 +19573,7 @@
    dynamic_linker=no
    ;;
  
@@ -5848,7 +5949,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19926,7 +19640,7 @@
+@@ -19926,7 +19633,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -5857,7 +5958,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19941,7 +19655,7 @@
+@@ -19941,7 +19648,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -5866,7 +5967,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19952,7 +19666,7 @@
+@@ -19952,7 +19659,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -5875,7 +5976,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -20014,22 +19728,19 @@
+@@ -20014,22 +19721,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'
@@ -5904,7 +6005,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,
-@@ -20039,6 +19750,30 @@
+@@ -20039,6 +19743,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -5935,7 +6036,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -20048,7 +19783,7 @@
+@@ -20048,7 +19776,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -5944,7 +6045,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -20077,7 +19812,7 @@
+@@ -20077,7 +19805,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -5953,7 +6054,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
-@@ -20097,7 +19832,7 @@
+@@ -20097,7 +19825,7 @@
  
  os2*)
    libname_spec='$name'
@@ -5962,7 +6063,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -20326,8 +20061,7 @@
+@@ -20326,8 +20054,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5972,7 +6073,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20430,8 +20164,7 @@
+@@ -20430,8 +20157,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5982,7 +6083,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20496,8 +20229,7 @@
+@@ -20496,8 +20222,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5992,7 +6093,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20590,8 +20322,7 @@
+@@ -20590,8 +20315,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6002,7 +6103,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20656,8 +20387,7 @@
+@@ -20656,8 +20380,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6012,7 +6113,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20723,8 +20453,7 @@
+@@ -20723,8 +20446,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6022,7 +6123,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20790,8 +20519,7 @@
+@@ -20790,8 +20512,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6032,25 +6133,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20866,7 +20594,7 @@
+@@ -20866,7 +20587,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 20869 "configure"
-+#line 20597 "configure"
++#line 20590 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20964,7 +20692,7 @@
+@@ -20964,7 +20685,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 20967 "configure"
-+#line 20695 "configure"
++#line 20688 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -21081,7 +20809,8 @@
+@@ -21081,7 +20802,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.
@@ -6060,7 +6161,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 \
-@@ -21211,7 +20940,7 @@
+@@ -21211,7 +20933,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -6069,7 +6170,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21242,7 +20971,7 @@
+@@ -21242,7 +20964,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -6078,7 +6179,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21459,7 +21188,10 @@
+@@ -21459,7 +21181,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.
@@ -6090,7 +6191,7 @@
  fi
  
  
-@@ -21522,7 +21254,8 @@
+@@ -21522,7 +21247,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.
@@ -6100,7 +6201,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 \
-@@ -21652,7 +21385,7 @@
+@@ -21652,7 +21378,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -6109,7 +6210,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21683,7 +21416,7 @@
+@@ -21683,7 +21409,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -6118,7 +6219,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21900,7 +21633,10 @@
+@@ -21900,7 +21626,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.
@@ -6130,7 +6231,7 @@
  fi
  
  
-@@ -21947,7 +21683,7 @@
+@@ -21947,7 +21676,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -6139,7 +6240,7 @@
  
  # Prevent multiple expansion
  
-@@ -22384,8 +22120,7 @@
+@@ -22384,8 +22113,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6149,7 +6250,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22482,8 +22217,7 @@
+@@ -22482,8 +22210,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6159,7 +6260,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22552,8 +22286,7 @@
+@@ -22552,8 +22279,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6169,7 +6270,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22656,8 +22389,7 @@
+@@ -22656,8 +22382,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6179,7 +6280,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22726,8 +22458,7 @@
+@@ -22726,8 +22451,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6189,7 +6290,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22802,8 +22533,7 @@
+@@ -22802,8 +22526,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6199,7 +6300,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22910,8 +22640,7 @@
+@@ -22910,8 +22633,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6209,7 +6310,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23182,8 +22911,7 @@
+@@ -23182,8 +22904,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6219,7 +6320,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23333,8 +23061,7 @@
+@@ -23333,8 +23054,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6229,7 +6330,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23519,8 +23246,7 @@
+@@ -23519,8 +23239,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6239,7 +6340,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23622,8 +23348,7 @@
+@@ -23622,8 +23341,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6249,7 +6350,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23725,8 +23450,7 @@
+@@ -23725,8 +23443,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6259,7 +6360,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23827,8 +23551,7 @@
+@@ -23827,8 +23544,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6269,7 +6370,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24119,8 +23842,7 @@
+@@ -24119,8 +23835,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6279,7 +6380,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24185,8 +23907,7 @@
+@@ -24185,8 +23900,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6289,7 +6390,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24250,8 +23971,7 @@
+@@ -24250,8 +23964,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6299,7 +6400,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24332,8 +24052,7 @@
+@@ -24332,8 +24045,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6309,7 +6410,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24474,8 +24193,7 @@
+@@ -24474,8 +24186,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6319,7 +6420,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24613,8 +24331,7 @@
+@@ -24613,8 +24324,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6329,7 +6430,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24798,8 +24515,7 @@
+@@ -24798,8 +24508,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6339,7 +6440,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25045,8 +24761,7 @@
+@@ -25045,8 +24754,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6349,7 +6450,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25239,8 +24954,7 @@
+@@ -25239,8 +24947,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6359,7 +6460,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25321,8 +25035,7 @@
+@@ -25321,8 +25028,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6369,7 +6470,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25392,8 +25105,7 @@
+@@ -25392,8 +25098,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6379,7 +6480,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25502,8 +25214,7 @@
+@@ -25502,8 +25207,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6389,7 +6490,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25595,8 +25306,7 @@
+@@ -25595,8 +25299,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6399,7 +6500,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25668,8 +25378,7 @@
+@@ -25668,8 +25371,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6409,7 +6510,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25723,8 +25432,7 @@
+@@ -25723,8 +25425,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6419,7 +6520,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25795,8 +25503,7 @@
+@@ -25795,8 +25496,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6429,7 +6530,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25850,8 +25557,7 @@
+@@ -25850,8 +25550,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6439,7 +6540,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25918,8 +25624,7 @@
+@@ -25918,8 +25617,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6449,7 +6550,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26097,8 +25802,7 @@
+@@ -26097,8 +25795,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6459,7 +6560,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26244,9 +25948,6 @@
+@@ -26244,9 +25941,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6469,7 +6570,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26280,8 +25981,7 @@
+@@ -26280,8 +25974,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6479,7 +6580,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26385,8 +26085,7 @@
+@@ -26385,8 +26078,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6489,7 +6590,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26465,9 +26164,6 @@
+@@ -26465,9 +26157,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6499,7 +6600,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26500,8 +26196,7 @@
+@@ -26500,8 +26189,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6509,7 +6610,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26604,8 +26299,7 @@
+@@ -26604,8 +26292,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6519,7 +6620,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26695,8 +26389,7 @@
+@@ -26695,8 +26382,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6529,7 +6630,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26757,8 +26450,7 @@
+@@ -26757,8 +26443,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6539,7 +6640,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26826,8 +26518,7 @@
+@@ -26826,8 +26511,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6549,7 +6650,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26893,8 +26584,7 @@
+@@ -26893,8 +26577,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6559,7 +6660,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26987,8 +26677,7 @@
+@@ -26987,8 +26670,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6569,7 +6670,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27066,8 +26755,7 @@
+@@ -27066,8 +26748,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6579,7 +6680,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27151,8 +26839,7 @@
+@@ -27151,8 +26832,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6589,7 +6690,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27220,8 +26907,7 @@
+@@ -27220,8 +26900,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6599,7 +6700,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27316,8 +27002,7 @@
+@@ -27316,8 +26995,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6609,7 +6710,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27381,8 +27066,7 @@
+@@ -27381,8 +27059,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6619,7 +6720,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27477,8 +27161,7 @@
+@@ -27477,8 +27154,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6629,7 +6730,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27542,8 +27225,7 @@
+@@ -27542,8 +27218,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6639,7 +6740,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27639,8 +27321,7 @@
+@@ -27639,8 +27314,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6649,7 +6750,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27704,8 +27385,7 @@
+@@ -27704,8 +27378,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6659,7 +6760,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27802,8 +27482,7 @@
+@@ -27802,8 +27475,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6669,7 +6770,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27868,8 +27547,7 @@
+@@ -27868,8 +27540,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6679,7 +6780,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27937,8 +27615,7 @@
+@@ -27937,8 +27608,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6689,7 +6790,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28089,8 +27766,7 @@
+@@ -28089,8 +27759,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6699,7 +6800,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28245,8 +27921,7 @@
+@@ -28245,8 +27914,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6709,7 +6810,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28311,8 +27986,7 @@
+@@ -28311,8 +27979,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6719,7 +6820,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28459,8 +28133,7 @@
+@@ -28459,8 +28126,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6729,7 +6830,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28615,8 +28288,7 @@
+@@ -28615,8 +28281,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6739,7 +6840,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28672,9 +28344,6 @@
+@@ -28672,9 +28337,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -6749,7 +6850,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28708,8 +28377,7 @@
+@@ -28708,8 +28370,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6759,7 +6860,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28813,8 +28481,7 @@
+@@ -28813,8 +28474,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6769,7 +6870,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28914,8 +28581,7 @@
+@@ -28914,8 +28574,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6779,7 +6880,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28989,8 +28655,7 @@
+@@ -28989,8 +28648,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6789,7 +6890,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29053,8 +28718,7 @@
+@@ -29053,8 +28711,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6799,7 +6900,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29116,8 +28780,7 @@
+@@ -29116,8 +28773,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6809,7 +6910,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29157,8 +28820,7 @@
+@@ -29157,8 +28813,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6819,7 +6920,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29214,8 +28876,7 @@
+@@ -29214,8 +28869,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6829,7 +6930,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29255,8 +28916,7 @@
+@@ -29255,8 +28909,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6839,7 +6940,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29320,8 +28980,7 @@
+@@ -29320,8 +28973,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6849,7 +6950,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29352,10 +29011,8 @@
+@@ -29352,10 +29004,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -6862,7 +6963,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -29466,8 +29123,7 @@
+@@ -29466,8 +29116,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6872,7 +6973,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29529,8 +29185,7 @@
+@@ -29529,8 +29178,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6882,7 +6983,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29570,8 +29225,7 @@
+@@ -29570,8 +29218,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6892,7 +6993,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29627,8 +29281,7 @@
+@@ -29627,8 +29274,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6902,7 +7003,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29668,8 +29321,7 @@
+@@ -29668,8 +29314,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6912,7 +7013,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29733,8 +29385,7 @@
+@@ -29733,8 +29378,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6922,7 +7023,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29765,10 +29416,8 @@
+@@ -29765,10 +29409,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -6935,7 +7036,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -29879,8 +29528,7 @@
+@@ -29879,8 +29521,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6945,7 +7046,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29942,8 +29590,7 @@
+@@ -29942,8 +29583,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6955,7 +7056,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29983,8 +29630,7 @@
+@@ -29983,8 +29623,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6965,7 +7066,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30040,8 +29686,7 @@
+@@ -30040,8 +29679,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6975,7 +7076,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30081,8 +29726,7 @@
+@@ -30081,8 +29719,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6985,7 +7086,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30146,8 +29790,7 @@
+@@ -30146,8 +29783,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6995,7 +7096,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30178,10 +29821,8 @@
+@@ -30178,10 +29814,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7008,7 +7109,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -30292,8 +29933,7 @@
+@@ -30292,8 +29926,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7018,7 +7119,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30355,8 +29995,7 @@
+@@ -30355,8 +29988,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7028,7 +7129,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30396,8 +30035,7 @@
+@@ -30396,8 +30028,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7038,7 +7139,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30453,8 +30091,7 @@
+@@ -30453,8 +30084,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7048,7 +7149,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30494,8 +30131,7 @@
+@@ -30494,8 +30124,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7058,7 +7159,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30559,8 +30195,7 @@
+@@ -30559,8 +30188,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7068,7 +7169,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30591,10 +30226,8 @@
+@@ -30591,10 +30219,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7081,7 +7182,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -30713,8 +30346,7 @@
+@@ -30713,8 +30339,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7091,7 +7192,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30785,8 +30417,7 @@
+@@ -30785,8 +30410,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7101,7 +7202,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30856,8 +30487,7 @@
+@@ -30856,8 +30480,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7111,7 +7212,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30919,8 +30549,7 @@
+@@ -30919,8 +30542,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7121,7 +7222,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30960,8 +30589,7 @@
+@@ -30960,8 +30582,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7131,7 +7232,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31017,8 +30645,7 @@
+@@ -31017,8 +30638,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7141,7 +7242,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31058,8 +30685,7 @@
+@@ -31058,8 +30678,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7151,7 +7252,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31123,8 +30749,7 @@
+@@ -31123,8 +30742,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7161,7 +7262,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31155,10 +30780,8 @@
+@@ -31155,10 +30773,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7174,7 +7275,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -31270,8 +30893,7 @@
+@@ -31270,8 +30886,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7184,7 +7285,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31333,8 +30955,7 @@
+@@ -31333,8 +30948,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7194,7 +7295,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31374,8 +30995,7 @@
+@@ -31374,8 +30988,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7204,7 +7305,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31431,8 +31051,7 @@
+@@ -31431,8 +31044,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7214,7 +7315,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31472,8 +31091,7 @@
+@@ -31472,8 +31084,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7224,7 +7325,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31537,8 +31155,7 @@
+@@ -31537,8 +31148,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7234,7 +7335,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31569,10 +31186,8 @@
+@@ -31569,10 +31179,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -7247,7 +7348,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -31683,8 +31298,7 @@
+@@ -31683,8 +31291,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7257,7 +7358,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31754,8 +31368,7 @@
+@@ -31754,8 +31361,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7267,7 +7368,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -31935,8 +31548,7 @@
+@@ -31935,8 +31541,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7277,7 +7378,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32045,8 +31657,7 @@
+@@ -32045,8 +31650,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7287,7 +7388,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32270,8 +31881,7 @@
+@@ -32270,8 +31874,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7297,7 +7398,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32494,8 +32104,7 @@
+@@ -32494,8 +32097,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7307,7 +7408,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32571,8 +32180,7 @@
+@@ -32571,8 +32173,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7317,7 +7418,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32798,8 +32406,7 @@
+@@ -32798,8 +32399,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7327,7 +7428,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32874,8 +32481,7 @@
+@@ -32874,8 +32474,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7337,7 +7438,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32935,8 +32541,7 @@
+@@ -32935,8 +32534,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7347,7 +7448,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33019,8 +32624,7 @@
+@@ -33019,8 +32617,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7357,7 +7458,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33113,8 +32717,7 @@
+@@ -33113,8 +32710,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7367,7 +7468,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33288,8 +32891,7 @@
+@@ -33288,8 +32884,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7377,7 +7478,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33387,8 +32989,7 @@
+@@ -33387,8 +32982,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7387,7 +7488,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33481,8 +33082,7 @@
+@@ -33481,8 +33075,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7397,7 +7498,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33565,8 +33165,7 @@
+@@ -33565,8 +33158,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7407,25 +7508,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33619,7 +33218,7 @@
+@@ -33619,7 +33211,7 @@
  do
    for j in jpeglib.h;
    do
 -    echo "configure: 33622: $i/$j" >&5
-+    echo "configure: 33221: $i/$j" >&5
++    echo "configure: 33214: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -33922,7 +33521,7 @@
+@@ -33922,7 +33514,7 @@
  do
    for j in $kde_qt_header;
    do
 -    echo "configure: 33925: $i/$j" >&5
-+    echo "configure: 33524: $i/$j" >&5
++    echo "configure: 33517: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -34599,8 +34198,7 @@
+@@ -34599,8 +34191,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7435,43 +7536,58 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34758,7 +34356,7 @@
+@@ -34758,7 +34349,7 @@
  do
    for j in $kde_check_header;
    do
 -    echo "configure: 34761: $i/$j" >&5
-+    echo "configure: 34359: $i/$j" >&5
++    echo "configure: 34352: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -34788,7 +34386,7 @@
+@@ -34788,7 +34379,7 @@
  do
    for j in $kde_check_lib;
    do
 -    echo "configure: 34791: $i/$j" >&5
-+    echo "configure: 34389: $i/$j" >&5
++    echo "configure: 34382: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -34806,7 +34404,7 @@
+@@ -34806,7 +34397,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
 -    echo "configure: 34809: $i/$j" >&5
-+    echo "configure: 34407: $i/$j" >&5
++    echo "configure: 34400: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -36304,7 +35902,7 @@
+@@ -34997,6 +34588,14 @@
+ 
+ 
+ 
++  if test "x$GXX" = "xyes"; then
++    kde_have_gcc_visibility=no
++  fi
++
++
++
++
++
+ echo "$as_me:$LINENO: checking for KDE paths" >&5
+ echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
+ kde_result=""
+@@ -36304,7 +35903,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
 -    echo "configure: 36307: $i/$j" >&5
-+    echo "configure: 35905: $i/$j" >&5
++    echo "configure: 35906: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -36535,8 +36133,7 @@
+@@ -36535,8 +36134,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7481,7 +7597,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36620,8 +36217,7 @@
+@@ -36620,8 +36218,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7491,7 +7607,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36714,8 +36310,7 @@
+@@ -36714,8 +36311,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7501,7 +7617,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36882,8 +36477,7 @@
+@@ -36882,8 +36478,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7511,7 +7627,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37038,8 +36632,7 @@
+@@ -37038,8 +36633,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7521,7 +7637,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37114,8 +36707,7 @@
+@@ -37114,8 +36708,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7531,7 +7647,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37157,8 +36749,7 @@
+@@ -37157,8 +36750,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7541,7 +7657,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37215,8 +36806,7 @@
+@@ -37215,8 +36807,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7551,7 +7667,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37346,9 +36936,6 @@
+@@ -37346,9 +36937,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7561,7 +7677,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37379,8 +36966,7 @@
+@@ -37379,8 +36967,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7571,7 +7687,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37481,8 +37067,7 @@
+@@ -37481,8 +37068,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7581,7 +7697,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37561,9 +37146,6 @@
+@@ -37561,9 +37147,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7591,7 +7707,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37594,8 +37176,7 @@
+@@ -37594,8 +37177,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7601,7 +7717,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37696,8 +37277,7 @@
+@@ -37696,8 +37278,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7611,7 +7727,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37776,9 +37356,6 @@
+@@ -37776,9 +37357,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7621,7 +7737,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37811,8 +37388,7 @@
+@@ -37811,8 +37389,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7631,7 +7747,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37915,8 +37491,7 @@
+@@ -37915,8 +37492,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7641,7 +7757,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37994,9 +37569,6 @@
+@@ -37994,9 +37570,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7651,7 +7767,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38029,8 +37601,7 @@
+@@ -38029,8 +37602,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7661,7 +7777,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38133,8 +37704,7 @@
+@@ -38133,8 +37705,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7671,7 +7787,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38214,9 +37784,6 @@
+@@ -38214,9 +37785,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7681,7 +7797,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38250,8 +37817,7 @@
+@@ -38250,8 +37818,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7691,7 +7807,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38355,8 +37921,7 @@
+@@ -38355,8 +37922,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7701,7 +7817,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38435,9 +38000,6 @@
+@@ -38435,9 +38001,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7711,7 +7827,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38471,8 +38033,7 @@
+@@ -38471,8 +38034,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7721,7 +7837,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38576,8 +38137,7 @@
+@@ -38576,8 +38138,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7731,7 +7847,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38656,9 +38216,6 @@
+@@ -38656,9 +38217,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7741,7 +7857,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38692,8 +38249,7 @@
+@@ -38692,8 +38250,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7751,7 +7867,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38797,8 +38353,7 @@
+@@ -38797,8 +38354,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7761,7 +7877,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38930,8 +38485,7 @@
+@@ -38930,8 +38486,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7771,7 +7887,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38989,9 +38543,6 @@
+@@ -38989,9 +38544,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7781,7 +7897,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39024,8 +38575,7 @@
+@@ -39024,8 +38576,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7791,7 +7907,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39128,8 +38678,7 @@
+@@ -39128,8 +38679,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7801,7 +7917,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39208,9 +38757,6 @@
+@@ -39208,9 +38758,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7811,7 +7927,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39245,8 +38791,7 @@
+@@ -39245,8 +38792,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7821,7 +7937,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39351,8 +38896,7 @@
+@@ -39351,8 +38897,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7831,7 +7947,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39431,9 +38975,6 @@
+@@ -39431,9 +38976,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7841,7 +7957,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39466,8 +39007,7 @@
+@@ -39466,8 +39008,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7851,7 +7967,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39570,8 +39110,7 @@
+@@ -39570,8 +39111,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7861,7 +7977,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39649,9 +39188,6 @@
+@@ -39649,9 +39189,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7871,7 +7987,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39684,8 +39220,7 @@
+@@ -39684,8 +39221,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7881,7 +7997,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39788,8 +39323,7 @@
+@@ -39788,8 +39324,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7891,7 +8007,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39883,8 +39417,7 @@
+@@ -39883,8 +39418,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7901,7 +8017,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39944,9 +39477,6 @@
+@@ -39944,9 +39478,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -7911,7 +8027,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39982,8 +39512,7 @@
+@@ -39982,8 +39513,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7921,7 +8037,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40089,8 +39618,7 @@
+@@ -40089,8 +39619,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7931,7 +8047,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40362,8 +39890,7 @@
+@@ -40362,8 +39891,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7941,7 +8057,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40535,8 +40062,7 @@
+@@ -40535,8 +40063,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7951,16 +8067,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40590,7 +40116,7 @@
+@@ -40590,7 +40117,7 @@
  do
    for j in qsql.html;
    do
 -    echo "configure: 40593: $i/$j" >&5
-+    echo "configure: 40119: $i/$j" >&5
++    echo "configure: 40120: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -40785,8 +40311,7 @@
+@@ -40785,8 +40312,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7970,7 +8086,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41019,8 +40544,7 @@
+@@ -41019,8 +40545,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7980,7 +8096,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41216,8 +40740,7 @@
+@@ -41216,8 +40741,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7990,7 +8106,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41291,8 +40814,7 @@
+@@ -41291,8 +40815,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8000,7 +8116,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41496,8 +41018,7 @@
+@@ -41496,8 +41019,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8010,7 +8126,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41566,8 +41087,7 @@
+@@ -41566,8 +41088,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8020,7 +8136,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41655,8 +41175,7 @@
+@@ -41655,8 +41176,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8030,7 +8146,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41746,8 +41265,7 @@
+@@ -41746,8 +41266,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8040,7 +8156,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41940,8 +41458,7 @@
+@@ -41940,8 +41459,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8050,7 +8166,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42007,8 +41524,7 @@
+@@ -42007,8 +41525,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8060,7 +8176,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42112,8 +41628,7 @@
+@@ -42112,8 +41629,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8070,7 +8186,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42214,8 +41729,7 @@
+@@ -42214,8 +41730,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8080,7 +8196,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42370,8 +41884,7 @@
+@@ -42370,8 +41885,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8090,7 +8206,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42415,8 +41928,7 @@
+@@ -42415,8 +41929,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8100,7 +8216,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42484,8 +41996,7 @@
+@@ -42484,8 +41997,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8110,7 +8226,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42546,8 +42057,7 @@
+@@ -42546,8 +42058,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8120,7 +8236,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42591,8 +42101,7 @@
+@@ -42591,8 +42102,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8130,7 +8246,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42660,8 +42169,7 @@
+@@ -42660,8 +42170,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8140,7 +8256,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42722,8 +42230,7 @@
+@@ -42722,8 +42231,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8150,7 +8266,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42910,8 +42417,7 @@
+@@ -42910,8 +42418,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8160,7 +8276,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43056,8 +42562,7 @@
+@@ -43056,8 +42563,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8170,7 +8286,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43191,8 +42696,7 @@
+@@ -43191,8 +42697,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8180,7 +8296,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43338,8 +42842,7 @@
+@@ -43338,8 +42843,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8190,7 +8306,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43430,8 +42933,7 @@
+@@ -43430,8 +42934,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8200,7 +8316,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43600,8 +43102,7 @@
+@@ -43600,8 +43103,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8210,7 +8326,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43672,8 +43173,7 @@
+@@ -43672,8 +43174,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8220,7 +8336,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43725,8 +43225,7 @@
+@@ -43725,8 +43226,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8230,7 +8346,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43778,8 +43277,7 @@
+@@ -43778,8 +43278,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8240,7 +8356,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43831,8 +43329,7 @@
+@@ -43831,8 +43330,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8250,7 +8366,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43888,8 +43385,7 @@
+@@ -43888,8 +43386,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8260,7 +8376,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44034,8 +43530,7 @@
+@@ -44034,8 +43531,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8270,7 +8386,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44106,8 +43601,7 @@
+@@ -44106,8 +43602,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8280,7 +8396,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44446,8 +43940,7 @@
+@@ -44446,8 +43941,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8290,7 +8406,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44550,8 +44043,7 @@
+@@ -44550,8 +44044,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8300,7 +8416,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44620,8 +44112,7 @@
+@@ -44620,8 +44113,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8310,7 +8426,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44774,8 +44265,7 @@
+@@ -44774,8 +44266,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8320,7 +8436,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44885,8 +44375,7 @@
+@@ -44885,8 +44376,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8330,7 +8446,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44991,8 +44480,7 @@
+@@ -44991,8 +44481,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8340,7 +8456,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45059,8 +44547,7 @@
+@@ -45059,8 +44548,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8350,7 +8466,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45162,8 +44649,7 @@
+@@ -45162,8 +44650,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8360,7 +8476,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45496,8 +44982,7 @@
+@@ -45496,8 +44983,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8370,7 +8486,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45586,8 +45071,7 @@
+@@ -45586,8 +45072,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8380,7 +8496,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45676,8 +45160,7 @@
+@@ -45676,8 +45161,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8390,7 +8506,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45771,8 +45254,7 @@
+@@ -45771,8 +45255,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8400,7 +8516,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45946,8 +45428,7 @@
+@@ -45946,8 +45429,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8410,7 +8526,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46079,8 +45560,7 @@
+@@ -46079,8 +45561,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8420,7 +8536,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46176,8 +45656,7 @@
+@@ -46176,8 +45657,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8430,7 +8546,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46301,8 +45780,7 @@
+@@ -46301,8 +45781,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8440,7 +8556,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46385,8 +45863,7 @@
+@@ -46385,8 +45864,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8450,16 +8566,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46439,7 +45916,7 @@
+@@ -46439,7 +45917,7 @@
  do
    for j in jpeglib.h;
    do
 -    echo "configure: 46442: $i/$j" >&5
-+    echo "configure: 45919: $i/$j" >&5
++    echo "configure: 45920: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -46532,8 +46009,7 @@
+@@ -46532,8 +46010,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8469,7 +8585,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46629,8 +46105,7 @@
+@@ -46629,8 +46106,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8479,7 +8595,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46806,8 +46281,7 @@
+@@ -46806,8 +46282,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8489,7 +8605,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46942,8 +46416,7 @@
+@@ -46942,8 +46417,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8499,7 +8615,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47235,8 +46708,7 @@
+@@ -47235,8 +46709,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8509,7 +8625,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47445,8 +46917,7 @@
+@@ -47445,8 +46918,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8519,7 +8635,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47541,8 +47012,7 @@
+@@ -47541,8 +47013,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8529,7 +8645,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47630,8 +47100,7 @@
+@@ -47630,8 +47101,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8539,7 +8655,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47777,8 +47246,7 @@
+@@ -47777,8 +47247,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8549,7 +8665,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47881,8 +47349,7 @@
+@@ -47881,8 +47350,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8559,7 +8675,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47957,8 +47424,7 @@
+@@ -47957,8 +47425,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8569,7 +8685,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48095,8 +47561,7 @@
+@@ -48095,8 +47562,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8579,16 +8695,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48182,7 +47647,7 @@
+@@ -48182,7 +47648,7 @@
  do
    for j in openssl/ssl.h;
    do
 -    echo "configure: 48185: $i/$j" >&5
-+    echo "configure: 47650: $i/$j" >&5
++    echo "configure: 47651: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -48237,8 +47702,7 @@
+@@ -48237,8 +47703,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8598,7 +8714,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48539,8 +48003,7 @@
+@@ -48539,8 +48004,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8608,7 +8724,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48761,8 +48224,7 @@
+@@ -48761,8 +48225,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8618,25 +8734,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48916,7 +48378,7 @@
+@@ -48916,7 +48379,7 @@
  do
    for j in gssapi.h;
    do
 -    echo "configure: 48919: $i/$j" >&5
-+    echo "configure: 48381: $i/$j" >&5
++    echo "configure: 48382: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        gssapi_incdir=$i
-@@ -48938,7 +48400,7 @@
+@@ -48938,7 +48401,7 @@
  do
    for j in libgssapi.$ext;
    do
 -    echo "configure: 48941: $i/$j" >&5
-+    echo "configure: 48403: $i/$j" >&5
++    echo "configure: 48404: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        gssapi_libdir=$i
-@@ -49057,8 +48519,7 @@
+@@ -49057,8 +48520,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8646,7 +8762,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49211,8 +48672,7 @@
+@@ -49211,8 +48673,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8656,7 +8772,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49285,8 +48745,7 @@
+@@ -49285,8 +48746,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8666,7 +8782,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49359,8 +48818,7 @@
+@@ -49359,8 +48819,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8676,7 +8792,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49433,8 +48891,7 @@
+@@ -49433,8 +48892,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8686,7 +8802,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49584,8 +49041,7 @@
+@@ -49584,8 +49042,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8696,7 +8812,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49703,8 +49159,7 @@
+@@ -49703,8 +49160,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8706,7 +8822,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49780,8 +49235,7 @@
+@@ -49780,8 +49236,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8716,7 +8832,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50001,8 +49455,7 @@
+@@ -50001,8 +49456,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8726,7 +8842,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50169,8 +49622,7 @@
+@@ -50169,8 +49623,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8736,7 +8852,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50335,8 +49787,7 @@
+@@ -50335,8 +49788,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8746,7 +8862,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50397,8 +49848,7 @@
+@@ -50397,8 +49849,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8756,7 +8872,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50465,8 +49915,7 @@
+@@ -50465,8 +49916,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8766,7 +8882,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50546,8 +49995,7 @@
+@@ -50546,8 +49996,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8776,7 +8892,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51529,6 +50977,13 @@
+@@ -51529,6 +50978,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -8790,7 +8906,7 @@
  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
-@@ -52708,6 +52163,9 @@
+@@ -52708,6 +52164,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -8800,7 +8916,7 @@
  s, at CC@,$CC,;t t
  s, at CFLAGS@,$CFLAGS,;t t
  s, at LDFLAGS@,$LDFLAGS,;t t
-@@ -53201,11 +52659,6 @@
+@@ -53201,11 +52660,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -8812,7 +8928,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.  */
-@@ -53244,6 +52697,12 @@
+@@ -53244,6 +52698,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -8826,8 +8942,8 @@
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
 diff -Nru kdelibs-3.4.2.orig/configure.in kdelibs-3.4.2/configure.in
---- kdelibs-3.4.2.orig/configure.in	2005-07-20 21:15:30.000000000 +0000
-+++ kdelibs-3.4.2/configure.in	2005-07-26 18:40:03.000000000 +0000
+--- kdelibs-3.4.2.orig/configure.in	2005-07-20 17:15:30.000000000 -0400
++++ kdelibs-3.4.2/configure.in	2005-08-16 10:53:47.000000000 -0400
 @@ -23,6 +23,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
  AM_INIT_AUTOMAKE(kdelibs, "3.4.2") dnl searches for some needed programs
@@ -8837,10 +8953,42 @@
  AC_PROG_INSTALL
  
  dnl generate the config header
+@@ -30,7 +32,6 @@
+ 
+ dnl Checks for programs.
+ AC_CHECK_COMPILERS
+-KDE_ENABLE_HIDDEN_VISIBILITY
+ AC_LIBLTDL_CONVENIENCE
+ 
+ AC_ENABLE_SHARED(yes)
+@@ -63,6 +64,8 @@
+ 
+ dnl Checks for libraries etc
+ AC_BASE_PATH_KDE([don't test]) dnl kdelibs is a special case
++KDE_ENABLE_HIDDEN_VISIBILITY
++
+ AC_CREATE_KFSSTND(default)
+ AC_SUBST_KFSSTND
+ 
 diff -Nru kdelibs-3.4.2.orig/dcop/client/Makefile.in kdelibs-3.4.2/dcop/client/Makefile.in
---- kdelibs-3.4.2.orig/dcop/client/Makefile.in	2005-07-20 21:20:03.000000000 +0000
-+++ kdelibs-3.4.2/dcop/client/Makefile.in	2005-07-26 18:49:32.466861248 +0000
-@@ -296,6 +296,9 @@
+--- kdelibs-3.4.2.orig/dcop/client/Makefile.in	2005-07-20 17:20:03.000000000 -0400
++++ kdelibs-3.4.2/dcop/client/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @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@
+@@ -296,6 +294,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8850,7 +8998,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -553,7 +554,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -8859,7 +9007,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -591,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8872,9 +9020,24 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/dcop/dcopidl/Makefile.in kdelibs-3.4.2/dcop/dcopidl/Makefile.in
---- kdelibs-3.4.2.orig/dcop/dcopidl/Makefile.in	2005-07-20 21:20:03.000000000 +0000
-+++ kdelibs-3.4.2/dcop/dcopidl/Makefile.in	2005-07-26 18:49:32.489857752 +0000
-@@ -257,6 +257,9 @@
+--- kdelibs-3.4.2.orig/dcop/dcopidl/Makefile.in	2005-07-20 17:20:03.000000000 -0400
++++ kdelibs-3.4.2/dcop/dcopidl/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(dcopidl_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -257,6 +255,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8884,7 +9047,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -505,7 +508,7 @@
+@@ -505,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -8893,7 +9056,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -543,9 +546,9 @@
+@@ -543,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8906,9 +9069,24 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/dcop/dcopidl2cpp/Makefile.in kdelibs-3.4.2/dcop/dcopidl2cpp/Makefile.in
---- kdelibs-3.4.2.orig/dcop/dcopidl2cpp/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/dcop/dcopidl2cpp/Makefile.in	2005-07-26 18:49:32.521852888 +0000
-@@ -259,6 +259,9 @@
+--- kdelibs-3.4.2.orig/dcop/dcopidl2cpp/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/dcop/dcopidl2cpp/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(dcopidl2cpp_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -259,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8918,7 +9096,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -504,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -8927,7 +9105,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -542,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -8940,8 +9118,14 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/dcop/dcopidlng/Makefile.in kdelibs-3.4.2/dcop/dcopidlng/Makefile.in
---- kdelibs-3.4.2.orig/dcop/dcopidlng/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/dcop/dcopidlng/Makefile.in	2005-07-26 18:49:32.555847720 +0000
+--- kdelibs-3.4.2.orig/dcop/dcopidlng/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/dcop/dcopidlng/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -230,6 +230,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -8983,9 +9167,24 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/dcop/KDE-ICE/Makefile.in kdelibs-3.4.2/dcop/KDE-ICE/Makefile.in
---- kdelibs-3.4.2.orig/dcop/KDE-ICE/Makefile.in	2005-07-20 21:20:03.000000000 +0000
-+++ kdelibs-3.4.2/dcop/KDE-ICE/Makefile.in	2005-07-26 18:49:31.984934512 +0000
-@@ -249,6 +249,9 @@
+--- kdelibs-3.4.2.orig/dcop/KDE-ICE/Makefile.in	2005-07-20 17:20:03.000000000 -0400
++++ kdelibs-3.4.2/dcop/KDE-ICE/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkICE_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -8995,7 +9194,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -524,7 +525,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -9004,7 +9203,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -562,9 +563,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9017,8 +9216,40 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/dcop/Makefile.in kdelibs-3.4.2/dcop/Makefile.in
---- kdelibs-3.4.2.orig/dcop/Makefile.in	2005-07-20 21:20:03.000000000 +0000
-+++ kdelibs-3.4.2/dcop/Makefile.in	2005-07-26 18:49:32.400871280 +0000
+--- kdelibs-3.4.2.orig/dcop/Makefile.in	2005-07-20 17:20:03.000000000 -0400
++++ kdelibs-3.4.2/dcop/Makefile.in	2005-08-16 10:58:19.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -40,10 +40,6 @@
+ 
+ 
+ 
+-#>- 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@
+@@ -172,9 +168,13 @@
+ #>+ 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
+ SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
+ 	$(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
+-	$(testdcop_SOURCES) $(testdcopc_SOURCES)
++	$(testdcop_SOURCES) $(testdcopc_SOURCES) $(dcopserver_SOURCES) 
+ #>- DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
+ #>- 	$(dcop_deadlock_test_SOURCES) $(dcopserver_shutdown_SOURCES) \
+ #>- 	$(testdcop_SOURCES) $(testdcopc_SOURCES)
 @@ -363,6 +363,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9104,9 +9335,24 @@
  	$(CXXLINK) -rpath $(libdir) $(libkdeinit_dcopserver_la_LDFLAGS) $(libkdeinit_dcopserver_la_OBJECTS) $(libkdeinit_dcopserver_la_LIBADD) $(LIBS)
  
 diff -Nru kdelibs-3.4.2.orig/dcop/tests/Makefile.in kdelibs-3.4.2/dcop/tests/Makefile.in
---- kdelibs-3.4.2.orig/dcop/tests/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/dcop/tests/Makefile.in	2005-07-26 18:49:32.604840272 +0000
-@@ -260,6 +260,9 @@
+--- kdelibs-3.4.2.orig/dcop/tests/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/dcop/tests/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(dcop_test_SOURCES) $(driver_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -260,6 +258,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9116,7 +9362,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -515,7 +516,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9125,7 +9371,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -553,9 +554,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9138,9 +9384,24 @@
  
  clean-noinstPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/dnssd/Makefile.in kdelibs-3.4.2/dnssd/Makefile.in
---- kdelibs-3.4.2.orig/dnssd/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/dnssd/Makefile.in	2005-07-26 18:49:32.684828112 +0000
-@@ -267,6 +267,9 @@
+--- kdelibs-3.4.2.orig/dnssd/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/dnssd/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkdnssd_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9150,7 +9411,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -528,7 +529,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9159,7 +9420,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -566,9 +567,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9172,8 +9433,14 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/doc/common/Makefile.in kdelibs-3.4.2/doc/common/Makefile.in
---- kdelibs-3.4.2.orig/doc/common/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/doc/common/Makefile.in	2005-07-26 18:49:32.765815800 +0000
+--- kdelibs-3.4.2.orig/doc/common/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/doc/common/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -229,6 +229,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9215,8 +9482,14 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/doc/kdelibs/Makefile.in kdelibs-3.4.2/doc/kdelibs/Makefile.in
---- kdelibs-3.4.2.orig/doc/kdelibs/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/doc/kdelibs/Makefile.in	2005-07-26 18:49:32.782813216 +0000
+--- kdelibs-3.4.2.orig/doc/kdelibs/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/doc/kdelibs/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -215,6 +215,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9249,8 +9522,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/doc/kspell/Makefile.in kdelibs-3.4.2/doc/kspell/Makefile.in
---- kdelibs-3.4.2.orig/doc/kspell/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/doc/kspell/Makefile.in	2005-07-26 18:49:32.820807440 +0000
+--- kdelibs-3.4.2.orig/doc/kspell/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/doc/kspell/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -215,6 +215,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9283,8 +9562,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/doc/Makefile.in kdelibs-3.4.2/doc/Makefile.in
---- kdelibs-3.4.2.orig/doc/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/doc/Makefile.in	2005-07-26 18:49:32.720822640 +0000
+--- kdelibs-3.4.2.orig/doc/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/doc/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9317,8 +9602,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/interfaces/khexedit/Makefile.in kdelibs-3.4.2/interfaces/khexedit/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/khexedit/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/khexedit/Makefile.in	2005-07-26 18:49:32.966785248 +0000
+--- kdelibs-3.4.2.orig/interfaces/khexedit/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/khexedit/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -232,6 +232,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9351,8 +9642,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/interfaces/kimproxy/interface/Makefile.in kdelibs-3.4.2/interfaces/kimproxy/interface/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kimproxy/interface/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kimproxy/interface/Makefile.in	2005-07-26 18:49:33.059771112 +0000
+--- kdelibs-3.4.2.orig/interfaces/kimproxy/interface/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kimproxy/interface/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -234,6 +234,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9385,8 +9682,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/interfaces/kimproxy/library/icons/Makefile.in kdelibs-3.4.2/interfaces/kimproxy/library/icons/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kimproxy/library/icons/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kimproxy/library/icons/Makefile.in	2005-07-26 18:49:33.155756520 +0000
+--- kdelibs-3.4.2.orig/interfaces/kimproxy/library/icons/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kimproxy/library/icons/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -215,6 +215,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9466,9 +9769,24 @@
  #>+ 15
  force-reedit:
 diff -Nru kdelibs-3.4.2.orig/interfaces/kimproxy/library/Makefile.in kdelibs-3.4.2/interfaces/kimproxy/library/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kimproxy/library/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kimproxy/library/Makefile.in	2005-07-26 18:49:33.122761536 +0000
-@@ -278,6 +278,9 @@
+--- kdelibs-3.4.2.orig/interfaces/kimproxy/library/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kimproxy/library/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkimproxy_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9478,7 +9796,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -533,7 +534,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9487,7 +9805,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -571,9 +572,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9500,8 +9818,14 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/interfaces/kimproxy/Makefile.in kdelibs-3.4.2/interfaces/kimproxy/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kimproxy/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kimproxy/Makefile.in	2005-07-26 18:49:33.010778560 +0000
+--- kdelibs-3.4.2.orig/interfaces/kimproxy/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kimproxy/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9534,8 +9858,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/interfaces/kio/Makefile.in kdelibs-3.4.2/interfaces/kio/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kio/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kio/Makefile.in	2005-07-26 18:49:33.188751504 +0000
+--- kdelibs-3.4.2.orig/interfaces/kio/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kio/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -228,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9568,9 +9898,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in kdelibs-3.4.2/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in	2005-07-26 18:49:33.345727640 +0000
-@@ -261,6 +261,9 @@
+--- kdelibs-3.4.2.orig/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kmediaplayer/kfileaudiopreview/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(kfileaudiopreview_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9580,7 +9925,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -509,7 +512,7 @@
+@@ -509,7 +510,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9589,7 +9934,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -547,9 +550,9 @@
+@@ -547,9 +548,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9602,9 +9947,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/interfaces/kmediaplayer/Makefile.in kdelibs-3.4.2/interfaces/kmediaplayer/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kmediaplayer/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kmediaplayer/Makefile.in	2005-07-26 18:49:33.296735088 +0000
-@@ -282,6 +282,9 @@
+--- kdelibs-3.4.2.orig/interfaces/kmediaplayer/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kmediaplayer/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkmediaplayer_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9614,7 +9974,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -536,7 +537,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9623,7 +9983,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -574,9 +575,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9636,8 +9996,14 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/interfaces/kregexpeditor/Makefile.in kdelibs-3.4.2/interfaces/kregexpeditor/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kregexpeditor/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kregexpeditor/Makefile.in	2005-07-26 18:49:33.379722472 +0000
+--- kdelibs-3.4.2.orig/interfaces/kregexpeditor/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kregexpeditor/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -234,6 +234,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9670,9 +10036,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/interfaces/kscript/Makefile.in kdelibs-3.4.2/interfaces/kscript/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kscript/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kscript/Makefile.in	2005-07-26 18:49:33.465709400 +0000
-@@ -282,6 +282,9 @@
+--- kdelibs-3.4.2.orig/interfaces/kscript/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kscript/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkscript_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9682,7 +10063,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -539,7 +540,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9691,7 +10072,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -577,9 +578,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9704,9 +10085,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/interfaces/kscript/sample/Makefile.in kdelibs-3.4.2/interfaces/kscript/sample/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kscript/sample/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kscript/sample/Makefile.in	2005-07-26 18:49:33.505703320 +0000
-@@ -259,6 +259,9 @@
+--- kdelibs-3.4.2.orig/interfaces/kscript/sample/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kscript/sample/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libshellscript_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -259,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9716,7 +10112,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -508,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9725,7 +10121,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -546,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9738,8 +10134,14 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/interfaces/kspeech/Makefile.in kdelibs-3.4.2/interfaces/kspeech/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/kspeech/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/kspeech/Makefile.in	2005-07-26 18:49:33.567693896 +0000
+--- kdelibs-3.4.2.orig/interfaces/kspeech/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/kspeech/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -232,6 +232,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9772,9 +10174,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/interfaces/ktexteditor/Makefile.in kdelibs-3.4.2/interfaces/ktexteditor/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/ktexteditor/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/ktexteditor/Makefile.in	2005-07-26 18:49:33.788660304 +0000
-@@ -306,6 +306,9 @@
+--- kdelibs-3.4.2.orig/interfaces/ktexteditor/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/interfaces/ktexteditor/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(libktexteditor_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -306,6 +304,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9784,7 +10201,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -604,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -9793,7 +10210,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9805,7 +10222,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1071,22 +1074,22 @@
+@@ -1071,22 +1072,22 @@
  mocs: view.moc
  
  #>+ 3
@@ -9835,7 +10252,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 
-@@ -1154,7 +1157,7 @@
+@@ -1154,7 +1155,7 @@
  
  
  #>+ 11
@@ -9845,8 +10262,14 @@
  	rm -f libktexteditor_la.all_cpp.files libktexteditor_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libktexteditor_la.all_cpp.final; \
 diff -Nru kdelibs-3.4.2.orig/interfaces/Makefile.in kdelibs-3.4.2/interfaces/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/Makefile.in	2005-07-20 21:20:04.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/Makefile.in	2005-07-26 18:49:32.889796952 +0000
+--- kdelibs-3.4.2.orig/interfaces/Makefile.in	2005-07-20 17:20:04.000000000 -0400
++++ kdelibs-3.4.2/interfaces/Makefile.in	2005-08-16 10:58:20.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -232,6 +232,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9879,8 +10302,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/interfaces/terminal/Makefile.in kdelibs-3.4.2/interfaces/terminal/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/terminal/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/terminal/Makefile.in	2005-07-26 18:49:33.819655592 +0000
+--- kdelibs-3.4.2.orig/interfaces/terminal/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/interfaces/terminal/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -228,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -9913,9 +10342,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/interfaces/terminal/test/Makefile.in kdelibs-3.4.2/interfaces/terminal/test/Makefile.in
---- kdelibs-3.4.2.orig/interfaces/terminal/test/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/interfaces/terminal/test/Makefile.in	2005-07-26 18:49:33.891644648 +0000
-@@ -248,6 +248,9 @@
+--- kdelibs-3.4.2.orig/interfaces/terminal/test/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/interfaces/terminal/test/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-SOURCES = $(test_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -248,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9925,7 +10369,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -492,7 +493,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -9934,7 +10378,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -530,9 +531,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9947,9 +10391,24 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/kab/Makefile.in kdelibs-3.4.2/kab/Makefile.in
---- kdelibs-3.4.2.orig/kab/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/kab/Makefile.in	2005-07-26 18:49:34.038622304 +0000
-@@ -251,6 +251,9 @@
+--- kdelibs-3.4.2.orig/kab/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/kab/Makefile.in	2005-08-16 10:58:21.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(libkab_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9959,7 +10418,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -504,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -9968,7 +10427,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -542,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -9980,7 +10439,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -787,18 +790,18 @@
+@@ -787,18 +788,18 @@
  
  
  #>+ 3
@@ -10005,7 +10464,7 @@
  
  #>+ 3
  addressbook.moc: $(srcdir)/addressbook.h
-@@ -809,7 +812,7 @@
+@@ -809,7 +810,7 @@
  
  #>+ 3
  clean-metasources:
@@ -10014,7 +10473,7 @@
  
  #>+ 2
  KDE_DIST=README.KABAPI template.kab template.config addressbook.h README.FORMAT kabapi.h Makefile.in qconfigDB.h Makefile.am 
-@@ -860,7 +863,7 @@
+@@ -860,7 +861,7 @@
  
  
  #>+ 11
@@ -10024,9 +10483,24 @@
  	rm -f libkab_la.all_cc.files libkab_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkab_la.all_cc.final; \
 diff -Nru kdelibs-3.4.2.orig/kabc/formats/Makefile.in kdelibs-3.4.2/kabc/formats/Makefile.in
---- kdelibs-3.4.2.orig/kabc/formats/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/kabc/formats/Makefile.in	2005-07-26 18:49:34.586539008 +0000
-@@ -261,6 +261,9 @@
+--- kdelibs-3.4.2.orig/kabc/formats/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/kabc/formats/Makefile.in	2005-08-16 10:58:24.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kabcformat_binary_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10036,7 +10510,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -520,7 +521,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10045,7 +10519,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -558,9 +559,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10058,9 +10532,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kabc/Makefile.in kdelibs-3.4.2/kabc/Makefile.in
---- kdelibs-3.4.2.orig/kabc/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/kabc/Makefile.in	2005-07-26 18:49:34.505551320 +0000
-@@ -394,6 +394,9 @@
+--- kdelibs-3.4.2.orig/kabc/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/kabc/Makefile.in	2005-08-16 10:58:24.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkabc_la_SOURCES) $(bigread_SOURCES) $(bigwrite_SOURCES) $(kab2kabc_SOURCES) $(kabcargl_SOURCES) $(testaddressee_SOURCES) $(testaddresseelist_SOURCES) $(testaddressfmt_SOURCES) $(testaddresslineedit_SOURCES) $(testdb_SOURCES) $(testdistlist_SOURCES) $(testkabc_SOURCES) $(testkabcdlg_SOURCES) $(testlock_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -394,6 +392,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10070,7 +10559,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -732,7 +735,7 @@
+@@ -732,7 +733,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10079,7 +10568,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -770,9 +773,9 @@
+@@ -770,9 +771,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10091,7 +10580,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1559,13 +1562,6 @@
+@@ -1559,13 +1560,6 @@
  mocs: resourceselectdialog.moc
  
  #>+ 3
@@ -10105,7 +10594,7 @@
  addressbook.moc: $(srcdir)/addressbook.h
  	$(MOC) $(srcdir)/addressbook.h -o addressbook.moc
  
-@@ -1573,11 +1569,11 @@
+@@ -1573,11 +1567,11 @@
  mocs: addressbook.moc
  
  #>+ 3
@@ -10120,7 +10609,7 @@
  
  #>+ 3
  distributionlisteditor.moc: $(srcdir)/distributionlisteditor.h
-@@ -1587,18 +1583,18 @@
+@@ -1587,18 +1581,18 @@
  mocs: distributionlisteditor.moc
  
  #>+ 3
@@ -10145,7 +10634,7 @@
  
  #>+ 3
  resource.moc: $(srcdir)/resource.h
-@@ -1608,6 +1604,13 @@
+@@ -1608,6 +1602,13 @@
  mocs: resource.moc
  
  #>+ 3
@@ -10159,7 +10648,7 @@
  distributionlistdialog.moc: $(srcdir)/distributionlistdialog.h
  	$(MOC) $(srcdir)/distributionlistdialog.h -o distributionlistdialog.moc
  
-@@ -1630,7 +1633,7 @@
+@@ -1630,7 +1631,7 @@
  
  #>+ 3
  clean-metasources:
@@ -10168,7 +10657,7 @@
  
  #>+ 2
  KDE_DIST=testlock.h vcard21parser.h HACKING kabc_manager.desktop README.AddressFormat HOWTO vcardtool.h addresseehelper.h countrytransl.map Makefile.in vcardformatimpl.h kab2kabc.desktop Makefile.am 
-@@ -1686,7 +1689,7 @@
+@@ -1686,7 +1687,7 @@
  
  
  #>+ 11
@@ -10178,9 +10667,24 @@
  	rm -f libkabc_la.all_cpp.files libkabc_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkabc_la.all_cpp.final; \
 diff -Nru kdelibs-3.4.2.orig/kabc/plugins/dir/Makefile.in kdelibs-3.4.2/kabc/plugins/dir/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/dir/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/kabc/plugins/dir/Makefile.in	2005-07-26 18:49:34.693522744 +0000
-@@ -273,6 +273,9 @@
+--- kdelibs-3.4.2.orig/kabc/plugins/dir/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/kabc/plugins/dir/Makefile.in	2005-08-16 10:58:24.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kabc_dir_la_SOURCES) $(libkabc_dir_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10190,7 +10694,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -534,7 +535,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10199,7 +10703,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -572,9 +573,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10212,9 +10716,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kabc/plugins/evolution/Makefile.in kdelibs-3.4.2/kabc/plugins/evolution/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/evolution/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/kabc/plugins/evolution/Makefile.in	2005-07-26 18:49:34.720518640 +0000
-@@ -267,6 +267,9 @@
+--- kdelibs-3.4.2.orig/kabc/plugins/evolution/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/kabc/plugins/evolution/Makefile.in	2005-08-16 10:58:24.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kabc_evo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10224,7 +10743,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -517,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10233,7 +10752,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10246,9 +10765,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kabc/plugins/file/Makefile.in kdelibs-3.4.2/kabc/plugins/file/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/file/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/kabc/plugins/file/Makefile.in	2005-07-26 18:49:34.938485504 +0000
-@@ -273,6 +273,9 @@
+--- kdelibs-3.4.2.orig/kabc/plugins/file/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/kabc/plugins/file/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kabc_file_la_SOURCES) $(libkabc_file_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10258,7 +10792,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -535,7 +536,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10267,7 +10801,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -573,9 +574,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10280,9 +10814,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kabc/plugins/ldapkio/Makefile.in kdelibs-3.4.2/kabc/plugins/ldapkio/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/ldapkio/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/kabc/plugins/ldapkio/Makefile.in	2005-07-26 18:49:35.031471368 +0000
-@@ -277,6 +277,9 @@
+--- kdelibs-3.4.2.orig/kabc/plugins/ldapkio/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/kabc/plugins/ldapkio/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kabc_ldapkio_la_SOURCES) $(libkabc_ldapkio_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -277,6 +275,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10292,7 +10841,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -536,7 +537,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10301,7 +10850,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -574,9 +575,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10314,8 +10863,14 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kabc/plugins/Makefile.in kdelibs-3.4.2/kabc/plugins/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/kabc/plugins/Makefile.in	2005-07-26 18:49:34.624533232 +0000
+--- kdelibs-3.4.2.orig/kabc/plugins/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/kabc/plugins/Makefile.in	2005-08-16 10:58:24.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -10348,9 +10903,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kabc/plugins/net/Makefile.in kdelibs-3.4.2/kabc/plugins/net/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/net/Makefile.in	2005-07-20 21:20:05.000000000 +0000
-+++ kdelibs-3.4.2/kabc/plugins/net/Makefile.in	2005-07-26 18:49:35.083463464 +0000
-@@ -274,6 +274,9 @@
+--- kdelibs-3.4.2.orig/kabc/plugins/net/Makefile.in	2005-07-20 17:20:05.000000000 -0400
++++ kdelibs-3.4.2/kabc/plugins/net/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kabc_net_la_SOURCES) $(libkabc_net_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -274,6 +272,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10360,7 +10930,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -533,7 +536,7 @@
+@@ -533,7 +534,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10369,7 +10939,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +574,9 @@
+@@ -571,9 +572,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10382,9 +10952,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kabc/plugins/sql/Makefile.in kdelibs-3.4.2/kabc/plugins/sql/Makefile.in
---- kdelibs-3.4.2.orig/kabc/plugins/sql/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kabc/plugins/sql/Makefile.in	2005-07-26 18:49:35.159451912 +0000
-@@ -264,6 +264,9 @@
+--- kdelibs-3.4.2.orig/kabc/plugins/sql/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kabc/plugins/sql/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kabc_sql_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10394,7 +10979,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -515,7 +516,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10403,7 +10988,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -553,9 +554,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10416,8 +11001,14 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kabc/scripts/Makefile.in kdelibs-3.4.2/kabc/scripts/Makefile.in
---- kdelibs-3.4.2.orig/kabc/scripts/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kabc/scripts/Makefile.in	2005-07-26 18:49:35.175449480 +0000
+--- kdelibs-3.4.2.orig/kabc/scripts/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kabc/scripts/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -215,6 +215,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -10450,9 +11041,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kabc/vcard/Makefile.in kdelibs-3.4.2/kabc/vcard/Makefile.in
---- kdelibs-3.4.2.orig/kabc/vcard/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kabc/vcard/Makefile.in	2005-07-26 18:49:35.215443400 +0000
-@@ -269,6 +269,9 @@
+--- kdelibs-3.4.2.orig/kabc/vcard/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kabc/vcard/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(libvcard_la_SOURCES) $(testread_SOURCES) $(testwrite_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -269,6 +267,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10462,7 +11068,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -525,7 +528,7 @@
+@@ -525,7 +526,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10471,7 +11077,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -563,9 +566,9 @@
+@@ -563,9 +564,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10483,7 +11089,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -832,7 +835,7 @@
+@@ -832,7 +833,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -10493,9 +11099,24 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/kabc/vcardparser/Makefile.in kdelibs-3.4.2/kabc/vcardparser/Makefile.in
---- kdelibs-3.4.2.orig/kabc/vcardparser/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kabc/vcardparser/Makefile.in	2005-07-26 18:49:35.261436408 +0000
-@@ -283,6 +283,9 @@
+--- kdelibs-3.4.2.orig/kabc/vcardparser/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kabc/vcardparser/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libvcards_la_SOURCES) $(testread_SOURCES) $(testread2_SOURCES) $(testwrite_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10505,7 +11126,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -537,7 +538,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10514,7 +11135,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -575,9 +576,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10527,8 +11148,14 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/kate/data/Makefile.in kdelibs-3.4.2/kate/data/Makefile.in
---- kdelibs-3.4.2.orig/kate/data/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kate/data/Makefile.in	2005-07-26 18:49:35.390416800 +0000
+--- kdelibs-3.4.2.orig/kate/data/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kate/data/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -10570,9 +11197,24 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/kate/interfaces/Makefile.in kdelibs-3.4.2/kate/interfaces/Makefile.in
---- kdelibs-3.4.2.orig/kate/interfaces/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kate/interfaces/Makefile.in	2005-07-26 18:49:35.434410112 +0000
-@@ -264,6 +264,9 @@
+--- kdelibs-3.4.2.orig/kate/interfaces/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kate/interfaces/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkatepartinterfaces_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10582,7 +11224,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10591,7 +11233,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10604,8 +11246,14 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kate/Makefile.in kdelibs-3.4.2/kate/Makefile.in
---- kdelibs-3.4.2.orig/kate/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kate/Makefile.in	2005-07-26 18:49:35.319427592 +0000
+--- kdelibs-3.4.2.orig/kate/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kate/Makefile.in	2005-08-16 10:58:25.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -233,6 +233,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -10638,9 +11286,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kate/part/Makefile.in kdelibs-3.4.2/kate/part/Makefile.in
---- kdelibs-3.4.2.orig/kate/part/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kate/part/Makefile.in	2005-07-26 18:49:35.812352656 +0000
-@@ -278,6 +278,9 @@
+--- kdelibs-3.4.2.orig/kate/part/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kate/part/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(libkatepart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10650,7 +11313,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +545,7 @@
+@@ -542,7 +543,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10659,7 +11322,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +583,9 @@
+@@ -580,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10671,7 +11334,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -891,13 +894,6 @@
+@@ -891,13 +892,6 @@
  mocs: katecodecompletion.moc
  
  #>+ 3
@@ -10685,7 +11348,7 @@
  katedocument.moc: $(srcdir)/katedocument.h
  	$(MOC) $(srcdir)/katedocument.h -o katedocument.moc
  
-@@ -905,18 +901,18 @@
+@@ -905,18 +899,18 @@
  mocs: katedocument.moc
  
  #>+ 3
@@ -10710,7 +11373,7 @@
  
  #>+ 3
  kateviewinternal.moc: $(srcdir)/kateviewinternal.h
-@@ -926,11 +922,11 @@
+@@ -926,11 +920,11 @@
  mocs: kateviewinternal.moc
  
  #>+ 3
@@ -10725,7 +11388,7 @@
  
  #>+ 3
  katedocumenthelpers.moc: $(srcdir)/katedocumenthelpers.h
-@@ -940,18 +936,18 @@
+@@ -940,18 +934,18 @@
  mocs: katedocumenthelpers.moc
  
  #>+ 3
@@ -10750,7 +11413,7 @@
  
  #>+ 3
  katehighlight.moc: $(srcdir)/katehighlight.h
-@@ -961,18 +957,18 @@
+@@ -961,18 +955,18 @@
  mocs: katehighlight.moc
  
  #>+ 3
@@ -10775,7 +11438,7 @@
  
  #>+ 3
  katesearch.moc: $(srcdir)/katesearch.h
-@@ -982,6 +978,13 @@
+@@ -982,6 +976,13 @@
  mocs: katesearch.moc
  
  #>+ 3
@@ -10789,7 +11452,7 @@
  katebuffer.moc: $(srcdir)/katebuffer.h
  	$(MOC) $(srcdir)/katebuffer.h -o katebuffer.moc
  
-@@ -1018,10 +1021,10 @@
+@@ -1018,10 +1019,10 @@
  
  #>+ 3
  clean-metasources:
@@ -10802,7 +11465,7 @@
  
  #>+ 4
  clean-idl:
-@@ -1074,7 +1077,7 @@
+@@ -1074,7 +1075,7 @@
  
  
  #>+ 11
@@ -10811,7 +11474,7 @@
  	@echo 'creating libkatepart_la.all_cpp.cpp ...'; \
  	rm -f libkatepart_la.all_cpp.files libkatepart_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkatepart_la.all_cpp.final; \
-@@ -1140,8 +1143,8 @@
+@@ -1140,8 +1141,8 @@
  katecodefoldinghelpers.lo: katecodefoldinghelpers.moc 
  katesearch.lo: katesearch.moc 
  katebuffer.lo: katebuffer.moc 
@@ -10822,9 +11485,24 @@
  kateview.lo: kateview.moc 
  nmcheck: 
 diff -Nru kdelibs-3.4.2.orig/kate/plugins/autobookmarker/Makefile.in kdelibs-3.4.2/kate/plugins/autobookmarker/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/autobookmarker/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kate/plugins/autobookmarker/Makefile.in	2005-07-26 18:49:36.976175728 +0000
-@@ -262,6 +262,9 @@
+--- kdelibs-3.4.2.orig/kate/plugins/autobookmarker/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kate/plugins/autobookmarker/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(ktexteditor_autobookmarker_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10834,7 +11512,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -512,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10843,7 +11521,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10856,9 +11534,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kate/plugins/insertfile/Makefile.in kdelibs-3.4.2/kate/plugins/insertfile/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/insertfile/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kate/plugins/insertfile/Makefile.in	2005-07-26 18:49:37.036166608 +0000
-@@ -263,6 +263,9 @@
+--- kdelibs-3.4.2.orig/kate/plugins/insertfile/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kate/plugins/insertfile/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(ktexteditor_insertfile_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10868,7 +11561,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10877,7 +11570,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10890,9 +11583,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kate/plugins/isearch/Makefile.in kdelibs-3.4.2/kate/plugins/isearch/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/isearch/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kate/plugins/isearch/Makefile.in	2005-07-26 18:49:37.100156880 +0000
-@@ -261,6 +261,9 @@
+--- kdelibs-3.4.2.orig/kate/plugins/isearch/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kate/plugins/isearch/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(ktexteditor_isearch_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10902,7 +11610,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -511,7 +512,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10911,7 +11619,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -549,9 +550,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10924,9 +11632,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kate/plugins/kdatatool/Makefile.in kdelibs-3.4.2/kate/plugins/kdatatool/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/kdatatool/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kate/plugins/kdatatool/Makefile.in	2005-07-26 18:49:37.143150344 +0000
-@@ -262,6 +262,9 @@
+--- kdelibs-3.4.2.orig/kate/plugins/kdatatool/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kate/plugins/kdatatool/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(ktexteditor_kdatatool_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10936,7 +11659,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -512,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10945,7 +11668,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10958,8 +11681,14 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kate/plugins/Makefile.in kdelibs-3.4.2/kate/plugins/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kate/plugins/Makefile.in	2005-07-26 18:49:36.238287904 +0000
+--- kdelibs-3.4.2.orig/kate/plugins/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kate/plugins/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -10992,9 +11721,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kate/plugins/wordcompletion/Makefile.in kdelibs-3.4.2/kate/plugins/wordcompletion/Makefile.in
---- kdelibs-3.4.2.orig/kate/plugins/wordcompletion/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kate/plugins/wordcompletion/Makefile.in	2005-07-26 18:49:37.210140160 +0000
-@@ -263,6 +263,9 @@
+--- kdelibs-3.4.2.orig/kate/plugins/wordcompletion/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kate/plugins/wordcompletion/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(ktexteditor_docwordcompletion_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11004,7 +11748,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11013,7 +11757,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11026,9 +11770,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kcert/Makefile.in kdelibs-3.4.2/kcert/Makefile.in
---- kdelibs-3.4.2.orig/kcert/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kcert/Makefile.in	2005-07-26 18:49:37.296127088 +0000
-@@ -260,6 +260,9 @@
+--- kdelibs-3.4.2.orig/kcert/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kcert/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkcertpart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -260,6 +258,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11038,7 +11797,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -510,7 +511,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -11047,7 +11806,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -548,9 +549,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11060,9 +11819,37 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kcmshell/Makefile.in kdelibs-3.4.2/kcmshell/Makefile.in
---- kdelibs-3.4.2.orig/kcmshell/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kcmshell/Makefile.in	2005-07-26 18:49:37.374115232 +0000
-@@ -295,6 +295,9 @@
+--- kdelibs-3.4.2.orig/kcmshell/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kcmshell/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -37,10 +37,6 @@
+ 
+ 
+ 
+-#>- SOURCES = $(kcmshell_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES) 
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -125,7 +121,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kcmshell_la_SOURCES)
++#>- SOURCES = $(kcmshell_la_SOURCES)
++#>+ 1
++SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES) 
+ #>- DIST_SOURCES = $(kcmshell_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kcmshell_la_SOURCES) $(kcmshell_SOURCES) 
+@@ -295,6 +293,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11072,7 +11859,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -549,7 +552,7 @@
+@@ -549,7 +550,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11081,7 +11868,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -587,9 +590,9 @@
+@@ -587,9 +588,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11094,9 +11881,37 @@
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kconf_update/Makefile.in kdelibs-3.4.2/kconf_update/Makefile.in
---- kdelibs-3.4.2.orig/kconf_update/Makefile.in	2005-07-20 21:20:06.000000000 +0000
-+++ kdelibs-3.4.2/kconf_update/Makefile.in	2005-07-26 18:49:37.428107024 +0000
-@@ -291,6 +291,9 @@
+--- kdelibs-3.4.2.orig/kconf_update/Makefile.in	2005-07-20 17:20:06.000000000 -0400
++++ kdelibs-3.4.2/kconf_update/Makefile.in	2005-08-16 10:58:26.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -34,10 +34,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-#>- SOURCES = $(kconf_update_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) 
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -122,7 +118,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kconf_update_la_SOURCES)
++#>- SOURCES = $(kconf_update_la_SOURCES)
++#>+ 1
++SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) 
+ #>- DIST_SOURCES = $(kconf_update_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) 
+@@ -291,6 +289,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11106,7 +11921,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -541,7 +542,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11115,7 +11930,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11128,9 +11943,24 @@
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdecore/kconfig_compiler/Makefile.in kdelibs-3.4.2/kdecore/kconfig_compiler/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/kconfig_compiler/Makefile.in	2005-07-20 21:20:08.000000000 +0000
-+++ kdelibs-3.4.2/kdecore/kconfig_compiler/Makefile.in	2005-07-26 18:49:39.088854552 +0000
-@@ -287,6 +287,9 @@
+--- kdelibs-3.4.2.orig/kdecore/kconfig_compiler/Makefile.in	2005-07-20 17:20:08.000000000 -0400
++++ kdelibs-3.4.2/kdecore/kconfig_compiler/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(autoexample_SOURCES) $(example_SOURCES) $(kconfig_compiler_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11140,7 +11970,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -545,7 +546,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11149,7 +11979,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11162,9 +11992,24 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdecore/kconfig_compiler/tests/Makefile.in kdelibs-3.4.2/kdecore/kconfig_compiler/tests/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/kconfig_compiler/tests/Makefile.in	2005-07-20 21:20:08.000000000 +0000
-+++ kdelibs-3.4.2/kdecore/kconfig_compiler/tests/Makefile.in	2005-07-26 18:49:39.147845584 +0000
-@@ -322,6 +322,9 @@
+--- kdelibs-3.4.2.orig/kdecore/kconfig_compiler/tests/Makefile.in	2005-07-20 17:20:08.000000000 -0400
++++ kdelibs-3.4.2/kdecore/kconfig_compiler/tests/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-SOURCES = $(test1_SOURCES) $(test2_SOURCES) $(test3_SOURCES) $(test4_SOURCES) $(test5_SOURCES) $(test6_SOURCES) $(test7_SOURCES) $(test8_SOURCES) $(test9_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -322,6 +320,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11174,7 +12019,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -600,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11183,7 +12028,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11195,7 +12040,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-@@ -975,7 +978,7 @@
+@@ -975,7 +976,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -11205,9 +12050,24 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/kdecore/Makefile.in kdelibs-3.4.2/kdecore/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/Makefile.in	2005-07-20 21:20:08.000000000 +0000
-+++ kdelibs-3.4.2/kdecore/Makefile.in	2005-07-26 18:49:39.018865192 +0000
-@@ -419,6 +419,9 @@
+--- kdelibs-3.4.2.orig/kdecore/Makefile.in	2005-07-20 17:20:08.000000000 -0400
++++ kdelibs-3.4.2/kdecore/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -41,8 +41,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkdefakes_nonpic_a_SOURCES) $(libkdecore_la_SOURCES) $(libkdefakes_la_SOURCES) $(kde_config_SOURCES) $(kgrantpty_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -419,6 +417,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11217,7 +12077,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -794,7 +797,7 @@
+@@ -794,7 +795,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -11226,7 +12086,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -832,9 +835,9 @@
+@@ -832,9 +833,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11238,7 +12098,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  kdemacros.h: stamp-h3
-@@ -846,7 +849,7 @@
+@@ -846,7 +847,7 @@
  stamp-h3: $(srcdir)/kdemacros.h.in $(top_builddir)/config.status
  	@rm -f stamp-h3
  	cd $(top_builddir) && $(SHELL) ./config.status kdecore/kdemacros.h
@@ -11247,7 +12107,7 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h3
  	touch $@
-@@ -1803,18 +1806,18 @@
+@@ -1803,18 +1804,18 @@
  mocs: kasyncio.moc
  
  #>+ 3
@@ -11272,7 +12132,7 @@
  
  #>+ 3
  kconfigdialogmanager.moc: $(srcdir)/kconfigdialogmanager.h
-@@ -1859,18 +1862,18 @@
+@@ -1859,18 +1860,18 @@
  mocs: ksock.moc
  
  #>+ 3
@@ -11297,7 +12157,7 @@
  
  #>+ 3
  kuniqueapplication.moc: $(srcdir)/kuniqueapplication.h
-@@ -1908,18 +1911,18 @@
+@@ -1908,18 +1909,18 @@
  mocs: klibloader.moc
  
  #>+ 3
@@ -11322,7 +12182,7 @@
  
  #>+ 3
  kaccelprivate.moc: $(srcdir)/kaccelprivate.h
-@@ -1937,7 +1940,7 @@
+@@ -1937,7 +1938,7 @@
  
  #>+ 3
  clean-metasources:
@@ -11331,7 +12191,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 kglobalaccel_emb.h DESIGN.kconfig MAINTAINERS README.kstartupinfo configure.in.in kdemacros.h.in libqt-mt.nmcheck kde_dmalloc.h kdebugrc kdebug.areas kdebugdcopiface.h kapplication_win.cpp language.codes libqt-mt_weak.nmcheck kaccelmanager_private.h Makefile.am kde-config.cpp.in 
-@@ -1995,7 +1998,7 @@
+@@ -1995,7 +1996,7 @@
  
  
  #>+ 11
@@ -11341,9 +12201,24 @@
  	rm -f libkdecore_la.all_cpp.files libkdecore_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdecore_la.all_cpp.final; \
 diff -Nru kdelibs-3.4.2.orig/kdecore/malloc/Makefile.in kdelibs-3.4.2/kdecore/malloc/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/malloc/Makefile.in	2005-07-20 21:20:08.000000000 +0000
-+++ kdelibs-3.4.2/kdecore/malloc/Makefile.in	2005-07-26 18:49:39.172841784 +0000
-@@ -259,6 +259,9 @@
+--- kdelibs-3.4.2.orig/kdecore/malloc/Makefile.in	2005-07-20 17:20:08.000000000 -0400
++++ kdelibs-3.4.2/kdecore/malloc/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -37,8 +37,6 @@
+ #    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ #    Boston, MA 02111-1307, USA.
+ 
+-SOURCES = $(libklmalloc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -259,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11353,7 +12228,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -11362,7 +12237,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11375,9 +12250,24 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/kdecore/network/Makefile.in kdelibs-3.4.2/kdecore/network/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/network/Makefile.in	2005-07-20 21:20:08.000000000 +0000
-+++ kdelibs-3.4.2/kdecore/network/Makefile.in	2005-07-26 18:49:39.330817768 +0000
-@@ -273,6 +273,9 @@
+--- kdelibs-3.4.2.orig/kdecore/network/Makefile.in	2005-07-20 17:20:08.000000000 -0400
++++ kdelibs-3.4.2/kdecore/network/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkdecorenetwork_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11387,7 +12277,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -567,7 +568,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11396,7 +12286,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -605,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11408,7 +12298,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -900,11 +903,11 @@
+@@ -900,11 +901,11 @@
  mocs: kreverseresolver.moc
  
  #>+ 3
@@ -11423,7 +12313,7 @@
  
  #>+ 3
  kdatagramsocket.moc: $(srcdir)/kdatagramsocket.h
-@@ -914,15 +917,15 @@
+@@ -914,15 +915,15 @@
  mocs: kdatagramsocket.moc
  
  #>+ 3
@@ -11443,7 +12333,7 @@
  
  #>+ 2
  KDE_DIST=Makefile.in Makefile.am 
-@@ -969,7 +972,7 @@
+@@ -969,7 +970,7 @@
  
  
  #>+ 11
@@ -11452,7 +12342,7 @@
  	@echo 'creating libkdecorenetwork_la.all_cpp.cpp ...'; \
  	rm -f libkdecorenetwork_la.all_cpp.files libkdecorenetwork_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdecorenetwork_la.all_cpp.final; \
-@@ -1021,7 +1024,7 @@
+@@ -1021,7 +1022,7 @@
  nmcheck-am: nmcheck
  kdatagramsocket.o: kdatagramsocket.moc 
  kreverseresolver.o: kreverseresolver.moc 
@@ -11462,9 +12352,24 @@
  kresolver.o: kresolver.moc 
  kclientsocketbase.lo: kclientsocketbase.moc 
 diff -Nru kdelibs-3.4.2.orig/kdecore/svgicons/Makefile.in kdelibs-3.4.2/kdecore/svgicons/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/svgicons/Makefile.in	2005-07-20 21:20:08.000000000 +0000
-+++ kdelibs-3.4.2/kdecore/svgicons/Makefile.in	2005-07-26 18:49:39.358813512 +0000
-@@ -261,6 +261,9 @@
+--- kdelibs-3.4.2.orig/kdecore/svgicons/Makefile.in	2005-07-20 17:20:08.000000000 -0400
++++ kdelibs-3.4.2/kdecore/svgicons/Makefile.in	2005-08-16 10:58:28.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkdesvgicons_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11474,7 +12379,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -504,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11483,7 +12388,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -542,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11496,9 +12401,24 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/kdecore/tests/Makefile.in kdelibs-3.4.2/kdecore/tests/Makefile.in
---- kdelibs-3.4.2.orig/kdecore/tests/Makefile.in	2005-07-20 21:20:08.000000000 +0000
-+++ kdelibs-3.4.2/kdecore/tests/Makefile.in	2005-07-26 18:49:39.567781744 +0000
-@@ -535,6 +535,9 @@
+--- kdelibs-3.4.2.orig/kdecore/tests/Makefile.in	2005-07-20 17:20:08.000000000 -0400
++++ kdelibs-3.4.2/kdecore/tests/Makefile.in	2005-08-16 10:58:29.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -34,8 +34,6 @@
+ #    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ #    Boston, MA 02111-1307, USA.
+ 
+-SOURCES = $(cplusplustest_SOURCES) $(dcopkonqtest_SOURCES) $(kapptest_SOURCES) $(kcalendartest_SOURCES) $(kcharsetstest_SOURCES) $(kcmdlineargstest_SOURCES) $(kconfigtest_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) $(kuniqueapptest_SOURCES) $(kurltest_SOURCES) $(kxerrorhandlertest_SOURCES) $(startserviceby_SOURCES) $(testqtargs_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -535,6 +533,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11508,7 +12428,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -824,7 +827,7 @@
+@@ -824,7 +825,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11517,7 +12437,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -862,9 +865,9 @@
+@@ -862,9 +863,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11529,7 +12449,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-@@ -1331,18 +1334,18 @@
+@@ -1331,18 +1332,18 @@
  mocs: kipctest.moc
  
  #>+ 3
@@ -11554,7 +12474,7 @@
  
  #>+ 5
  KIDLTest.kidl: $(srcdir)/KIDLTest.h $(DCOP_DEPENDENCIES)
-@@ -1356,7 +1359,7 @@
+@@ -1356,7 +1357,7 @@
  
  #>+ 3
  clean-metasources:
@@ -11564,9 +12484,39 @@
  #>+ 2
  KDE_DIST=Makefile.in Makefile.am 
 diff -Nru kdelibs-3.4.2.orig/kded/Makefile.in kdelibs-3.4.2/kded/Makefile.in
---- kdelibs-3.4.2.orig/kded/Makefile.in	2005-07-20 21:20:08.000000000 +0000
-+++ kdelibs-3.4.2/kded/Makefile.in	2005-07-26 18:49:39.755753168 +0000
-@@ -330,6 +330,9 @@
+--- kdelibs-3.4.2.orig/kded/Makefile.in	2005-07-20 17:20:08.000000000 -0400
++++ kdelibs-3.4.2/kded/Makefile.in	2005-08-16 10:58:29.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -37,10 +37,6 @@
+ 
+ 
+ 
+-#>- 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@
+@@ -152,8 +148,11 @@
+ #>+ 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)
++#>+ 2
+ SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
+-	$(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
++	$(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES) 
+ #>- DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \
+ #>- 	$(kde_menu_SOURCES) $(kdontchangethehostname_SOURCES)
+ #>+ 2
+@@ -330,6 +329,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11576,7 +12526,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -612,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11585,7 +12535,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -650,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11597,7 +12547,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1111,18 +1114,18 @@
+@@ -1111,18 +1113,18 @@
  kbuildsycoca_DEPENDENCIES = libkdeinit_kbuildsycoca.la
  
  #>+ 3
@@ -11622,7 +12572,7 @@
  
  #>+ 3
  kdedmodule.moc: $(srcdir)/kdedmodule.h
-@@ -1140,7 +1143,7 @@
+@@ -1140,7 +1142,7 @@
  
  #>+ 3
  clean-metasources:
@@ -11632,9 +12582,24 @@
  #>+ 2
  KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
 diff -Nru kdelibs-3.4.2.orig/kded/test/Makefile.in kdelibs-3.4.2/kded/test/Makefile.in
---- kdelibs-3.4.2.orig/kded/test/Makefile.in	2005-07-20 21:20:08.000000000 +0000
-+++ kdelibs-3.4.2/kded/test/Makefile.in	2005-07-26 18:49:39.817743744 +0000
-@@ -265,6 +265,9 @@
+--- kdelibs-3.4.2.orig/kded/test/Makefile.in	2005-07-20 17:20:08.000000000 -0400
++++ kdelibs-3.4.2/kded/test/Makefile.in	2005-08-16 10:58:29.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ # $Id: Makefile.am 334039 2004-07-30 03:27:07Z nhasan $
+ 
+ 
+-SOURCES = $(kded_test_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -265,6 +263,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11644,7 +12609,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -516,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11653,7 +12618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -554,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11666,9 +12631,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdefx/Makefile.in kdelibs-3.4.2/kdefx/Makefile.in
---- kdelibs-3.4.2.orig/kdefx/Makefile.in	2005-07-20 21:20:08.000000000 +0000
-+++ kdelibs-3.4.2/kdefx/Makefile.in	2005-07-26 18:49:40.057707264 +0000
-@@ -288,6 +288,9 @@
+--- kdelibs-3.4.2.orig/kdefx/Makefile.in	2005-07-20 17:20:08.000000000 -0400
++++ kdelibs-3.4.2/kdefx/Makefile.in	2005-08-16 10:58:30.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -37,8 +37,6 @@
+ #SUBDIRS = . tests
+ 
+ 
+-SOURCES = $(libkdefx_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11678,7 +12658,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -547,7 +550,7 @@
+@@ -547,7 +548,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11687,7 +12667,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -585,9 +588,9 @@
+@@ -585,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11700,9 +12680,37 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeprint/cups/cupsdconf2/Makefile.in kdelibs-3.4.2/kdeprint/cups/cupsdconf2/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/cups/cupsdconf2/Makefile.in	2005-07-20 21:20:09.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/cups/cupsdconf2/Makefile.in	2005-07-26 18:49:41.332513464 +0000
-@@ -297,6 +297,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/cups/cupsdconf2/Makefile.in	2005-07-20 17:20:09.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/cups/cupsdconf2/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -20,10 +20,6 @@
+ 
+ 
+ 
+-#>- SOURCES = $(cupsdconf_la_SOURCES)
+-#>+ 1
+-SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -125,7 +121,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(cupsdconf_la_SOURCES)
++#>- SOURCES = $(cupsdconf_la_SOURCES)
++#>+ 1
++SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
+ #>- DIST_SOURCES = $(cupsdconf_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(cupsdconf_la_SOURCES) $(cupsdconf_SOURCES) 
+@@ -297,6 +295,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11712,7 +12720,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -568,7 +569,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -11721,7 +12729,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -606,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11733,7 +12741,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1090,22 +1093,22 @@
+@@ -1090,22 +1091,22 @@
  mocs: cupsdnetworkpage.moc
  
  #>+ 3
@@ -11763,7 +12771,7 @@
  
  #>+ 2
  KDE_DIST=kde_logo.png Makefile.in cupsd.conf.template cupsdcomment.pl cups_logo.png Makefile.am 
-@@ -1152,7 +1155,7 @@
+@@ -1152,7 +1153,7 @@
  
  
  #>+ 11
@@ -11772,7 +12780,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; \
-@@ -1164,7 +1167,7 @@
+@@ -1164,7 +1165,7 @@
  	rm -f libkdeinit_cupsdconf_la.all_cpp.final libkdeinit_cupsdconf_la.all_cpp.files
  
  #>+ 11
@@ -11782,9 +12790,24 @@
  	rm -f cupsdconf_la.all_cpp.files cupsdconf_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> cupsdconf_la.all_cpp.final; \
 diff -Nru kdelibs-3.4.2.orig/kdeprint/cups/Makefile.in kdelibs-3.4.2/kdeprint/cups/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/cups/Makefile.in	2005-07-20 21:20:09.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/cups/Makefile.in	2005-07-26 18:49:40.807593264 +0000
-@@ -327,6 +327,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/cups/Makefile.in	2005-07-20 17:20:09.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/cups/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ 
+ 
+ 
+-SOURCES = $(kdeprint_cups_la_SOURCES) $(cupsdoprint_SOURCES) $(make_driver_db_cups_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -327,6 +325,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11794,7 +12817,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -602,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -11803,7 +12826,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11815,7 +12838,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1167,18 +1170,18 @@
+@@ -1167,18 +1168,18 @@
  mocs: kpimagepage.moc
  
  #>+ 3
@@ -11840,7 +12863,7 @@
  
  #>+ 3
  kmwippprinter.moc: $(srcdir)/kmwippprinter.h
-@@ -1224,7 +1227,7 @@
+@@ -1224,7 +1225,7 @@
  
  #>+ 3
  clean-metasources:
@@ -11849,7 +12872,7 @@
  
  #>+ 2
  KDE_DIST=cups.print Makefile.in preview-mini.png configure.in.in preview.png Makefile.am 
-@@ -1275,7 +1278,7 @@
+@@ -1275,7 +1276,7 @@
  
  
  #>+ 11
@@ -11859,9 +12882,24 @@
  	rm -f kdeprint_cups_la.all_cpp.files kdeprint_cups_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kdeprint_cups_la.all_cpp.final; \
 diff -Nru kdelibs-3.4.2.orig/kdeprint/ext/Makefile.in kdelibs-3.4.2/kdeprint/ext/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/ext/Makefile.in	2005-07-20 21:20:09.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/ext/Makefile.in	2005-07-26 18:49:41.373507232 +0000
-@@ -267,6 +267,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/ext/Makefile.in	2005-07-20 17:20:09.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/ext/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kdeprint_ext_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11871,7 +12909,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,7 @@
+@@ -518,7 +519,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11880,7 +12918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +559,9 @@
+@@ -556,9 +557,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11893,8 +12931,14 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeprint/filters/Makefile.in kdelibs-3.4.2/kdeprint/filters/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/filters/Makefile.in	2005-07-20 21:20:09.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/filters/Makefile.in	2005-07-26 18:49:41.390504648 +0000
+--- kdelibs-3.4.2.orig/kdeprint/filters/Makefile.in	2005-07-20 17:20:09.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/filters/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -228,6 +228,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -11927,9 +12971,24 @@
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeprint/foomatic/Makefile.in kdelibs-3.4.2/kdeprint/foomatic/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/foomatic/Makefile.in	2005-07-20 21:20:09.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/foomatic/Makefile.in	2005-07-26 18:49:41.438497352 +0000
-@@ -289,6 +289,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/foomatic/Makefile.in	2005-07-20 17:20:09.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/foomatic/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ 
+ 
+ 
+-SOURCES = $(kdeprint_foomatic_la_SOURCES) $(make_driver_db_foomatic_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11939,7 +12998,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -545,7 +548,7 @@
+@@ -545,7 +546,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -11948,7 +13007,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +586,9 @@
+@@ -583,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11961,9 +13020,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeprint/lpd/Makefile.in kdelibs-3.4.2/kdeprint/lpd/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/lpd/Makefile.in	2005-07-20 21:20:09.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/lpd/Makefile.in	2005-07-26 18:49:41.483490512 +0000
-@@ -287,6 +287,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/lpd/Makefile.in	2005-07-20 17:20:09.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/lpd/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ 
+ 
+ 
+-SOURCES = $(kdeprint_lpd_la_SOURCES) $(make_driver_db_lpd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11973,7 +13047,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +544,7 @@
+@@ -541,7 +542,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -11982,7 +13056,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +582,9 @@
+@@ -579,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11995,9 +13069,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeprint/lpdunix/Makefile.in kdelibs-3.4.2/kdeprint/lpdunix/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/lpdunix/Makefile.in	2005-07-20 21:20:09.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/lpdunix/Makefile.in	2005-07-26 18:49:41.525484128 +0000
-@@ -269,6 +269,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/lpdunix/Makefile.in	2005-07-20 17:20:09.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/lpdunix/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kdeprint_lpdunix_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -269,6 +267,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12007,7 +13096,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -520,7 +521,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12016,7 +13105,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -558,9 +559,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12029,9 +13118,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeprint/lpr/Makefile.in kdelibs-3.4.2/kdeprint/lpr/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/lpr/Makefile.in	2005-07-20 21:20:09.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/lpr/Makefile.in	2005-07-26 18:49:42.624317080 +0000
-@@ -301,6 +301,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/lpr/Makefile.in	2005-07-20 17:20:09.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/lpr/Makefile.in	2005-08-16 10:58:32.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ 
+ 
+ 
+-SOURCES = $(kdeprint_lpr_la_SOURCES) $(make_driver_db_lpr_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12041,7 +13145,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -574,7 +575,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -12050,7 +13154,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -612,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12063,9 +13167,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeprint/Makefile.in kdelibs-3.4.2/kdeprint/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/Makefile.in	2005-07-20 21:20:09.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/Makefile.in	2005-07-26 18:49:40.602624424 +0000
-@@ -341,6 +341,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/Makefile.in	2005-07-20 17:20:09.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/Makefile.in	2005-08-16 10:58:31.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ 
+ 
+ 
+-SOURCES = $(libdriverparse_a_SOURCES) $(kded_kdeprintd_la_SOURCES) $(libkdeprint_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -341,6 +339,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12075,7 +13194,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -663,7 +666,7 @@
+@@ -663,7 +664,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -12084,7 +13203,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -701,9 +704,9 @@
+@@ -701,9 +702,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12096,7 +13215,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-@@ -1540,13 +1543,6 @@
+@@ -1540,13 +1541,6 @@
  
  
  #>+ 3
@@ -12110,7 +13229,7 @@
  posterpreview.moc: $(srcdir)/posterpreview.h
  	$(MOC) $(srcdir)/posterpreview.h -o posterpreview.moc
  
-@@ -1554,11 +1550,11 @@
+@@ -1554,11 +1548,11 @@
  mocs: posterpreview.moc
  
  #>+ 3
@@ -12125,7 +13244,7 @@
  
  #>+ 3
  marginpreview.moc: $(srcdir)/marginpreview.h
-@@ -1568,6 +1564,13 @@
+@@ -1568,6 +1562,13 @@
  mocs: marginpreview.moc
  
  #>+ 3
@@ -12139,7 +13258,7 @@
  kmjobmanager.moc: $(srcdir)/kmjobmanager.h
  	$(MOC) $(srcdir)/kmjobmanager.h -o kmjobmanager.moc
  
-@@ -1596,11 +1599,11 @@
+@@ -1596,11 +1597,11 @@
  mocs: plugincombobox.moc
  
  #>+ 3
@@ -12154,7 +13273,7 @@
  
  #>+ 3
  kpgeneralpage.moc: $(srcdir)/kpgeneralpage.h
-@@ -1610,11 +1613,11 @@
+@@ -1610,11 +1611,11 @@
  mocs: kpgeneralpage.moc
  
  #>+ 3
@@ -12169,7 +13288,7 @@
  
  #>+ 3
  kpfilterpage.moc: $(srcdir)/kpfilterpage.h
-@@ -1624,18 +1627,18 @@
+@@ -1624,18 +1625,18 @@
  mocs: kpfilterpage.moc
  
  #>+ 3
@@ -12194,7 +13313,7 @@
  
  #>+ 3
  kprintprocess.moc: $(srcdir)/kprintprocess.h
-@@ -1652,18 +1655,18 @@
+@@ -1652,18 +1653,18 @@
  mocs: kfilelist.moc
  
  #>+ 3
@@ -12219,7 +13338,7 @@
  
  #>+ 3
  kprinterimpl.moc: $(srcdir)/kprinterimpl.h
-@@ -1701,18 +1704,18 @@
+@@ -1701,18 +1702,18 @@
  mocs: kmuimanager.moc
  
  #>+ 3
@@ -12244,7 +13363,7 @@
  
  #>+ 3
  kprintaction.moc: $(srcdir)/kprintaction.h
-@@ -1723,7 +1726,7 @@
+@@ -1723,7 +1724,7 @@
  
  #>+ 3
  clean-metasources:
@@ -12254,8 +13373,40 @@
  #>+ 2
  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 
 diff -Nru kdelibs-3.4.2.orig/kdeprint/management/Makefile.in kdelibs-3.4.2/kdeprint/management/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/management/Makefile.in	2005-07-20 21:20:09.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/management/Makefile.in	2005-07-26 18:49:42.893276192 +0000
+--- kdelibs-3.4.2.orig/kdeprint/management/Makefile.in	2005-07-20 17:20:09.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/management/Makefile.in	2005-08-16 10:58:32.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,10 +18,6 @@
+ 
+ 
+ 
+-#>- 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@
+@@ -159,9 +155,13 @@
+ #>+ 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
+ SOURCES = $(kaddprinterwizard_la_SOURCES) \
+ 	$(libkdeprint_management_la_SOURCES) \
+-	$(libkdeprint_management_module_la_SOURCES)
++	$(libkdeprint_management_module_la_SOURCES) $(kaddprinterwizard_SOURCES) 
+ #>- DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \
+ #>- 	$(libkdeprint_management_la_SOURCES) \
+ #>- 	$(libkdeprint_management_module_la_SOURCES)
 @@ -338,6 +338,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -12471,8 +13622,14 @@
  kmdriverdbwidget.o: kmdriverdbwidget.moc 
  pluginaction.lo: pluginaction.moc 
 diff -Nru kdelibs-3.4.2.orig/kdeprint/pics/Makefile.in kdelibs-3.4.2/kdeprint/pics/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/pics/Makefile.in	2005-07-20 21:20:10.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/pics/Makefile.in	2005-07-26 18:49:43.312212504 +0000
+--- kdelibs-3.4.2.orig/kdeprint/pics/Makefile.in	2005-07-20 17:20:10.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/pics/Makefile.in	2005-08-16 10:58:32.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -12730,9 +13887,24 @@
  #>+ 15
  force-reedit:
 diff -Nru kdelibs-3.4.2.orig/kdeprint/rlpr/Makefile.in kdelibs-3.4.2/kdeprint/rlpr/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/rlpr/Makefile.in	2005-07-20 21:20:10.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/rlpr/Makefile.in	2005-07-26 18:49:43.479187120 +0000
-@@ -269,6 +269,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/rlpr/Makefile.in	2005-07-20 17:20:10.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/rlpr/Makefile.in	2005-08-16 10:58:33.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kdeprint_rlpr_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -269,6 +267,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12742,7 +13914,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -524,7 +525,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12751,7 +13923,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -562,9 +563,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12764,9 +13936,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeprint/tests/Makefile.in kdelibs-3.4.2/kdeprint/tests/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/tests/Makefile.in	2005-07-20 21:20:10.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/tests/Makefile.in	2005-07-26 18:49:43.587170704 +0000
-@@ -256,6 +256,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/tests/Makefile.in	2005-07-20 17:20:10.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/tests/Makefile.in	2005-08-16 10:58:33.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-SOURCES = $(drawdemo_SOURCES) $(helpviewer_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -256,6 +254,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12776,7 +13963,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -505,7 +508,7 @@
+@@ -505,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12785,7 +13972,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -543,9 +546,9 @@
+@@ -543,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12798,9 +13985,24 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/kdeprint/tools/escputil/Makefile.in kdelibs-3.4.2/kdeprint/tools/escputil/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/tools/escputil/Makefile.in	2005-07-20 21:20:10.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/tools/escputil/Makefile.in	2005-07-26 18:49:43.644162040 +0000
-@@ -264,6 +264,9 @@
+--- kdelibs-3.4.2.orig/kdeprint/tools/escputil/Makefile.in	2005-07-20 17:20:10.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/tools/escputil/Makefile.in	2005-08-16 10:58:33.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kdeprint_tool_escputil_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12810,7 +14012,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,7 +517,7 @@
+@@ -514,7 +515,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12819,7 +14021,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -552,9 +555,9 @@
+@@ -552,9 +553,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12832,8 +14034,14 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeprint/tools/Makefile.in kdelibs-3.4.2/kdeprint/tools/Makefile.in
---- kdelibs-3.4.2.orig/kdeprint/tools/Makefile.in	2005-07-20 21:20:10.000000000 +0000
-+++ kdelibs-3.4.2/kdeprint/tools/Makefile.in	2005-07-26 18:49:43.603168272 +0000
+--- kdelibs-3.4.2.orig/kdeprint/tools/Makefile.in	2005-07-20 17:20:10.000000000 -0400
++++ kdelibs-3.4.2/kdeprint/tools/Makefile.in	2005-08-16 10:58:33.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -12866,9 +14074,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kdesu/Makefile.in kdelibs-3.4.2/kdesu/Makefile.in
---- kdelibs-3.4.2.orig/kdesu/Makefile.in	2005-07-20 21:20:10.000000000 +0000
-+++ kdelibs-3.4.2/kdesu/Makefile.in	2005-07-26 18:49:43.677157024 +0000
-@@ -283,6 +283,9 @@
+--- kdelibs-3.4.2.orig/kdesu/Makefile.in	2005-07-20 17:20:10.000000000 -0400
++++ kdelibs-3.4.2/kdesu/Makefile.in	2005-08-16 10:58:33.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkdesu_la_SOURCES) $(kdesu_stub_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12878,7 +14101,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -536,7 +537,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -12887,7 +14110,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -574,9 +575,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12900,8 +14123,14 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeui/about/Makefile.in kdelibs-3.4.2/kdeui/about/Makefile.in
---- kdelibs-3.4.2.orig/kdeui/about/Makefile.in	2005-07-20 21:20:11.000000000 +0000
-+++ kdelibs-3.4.2/kdeui/about/Makefile.in	2005-07-26 18:49:45.889820648 +0000
+--- kdelibs-3.4.2.orig/kdeui/about/Makefile.in	2005-07-20 17:20:11.000000000 -0400
++++ kdelibs-3.4.2/kdeui/about/Makefile.in	2005-08-16 10:58:35.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -12934,8 +14163,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kdeui/colors/Makefile.in kdelibs-3.4.2/kdeui/colors/Makefile.in
---- kdelibs-3.4.2.orig/kdeui/colors/Makefile.in	2005-07-20 21:20:11.000000000 +0000
-+++ kdelibs-3.4.2/kdeui/colors/Makefile.in	2005-07-26 18:49:45.904818368 +0000
+--- kdelibs-3.4.2.orig/kdeui/colors/Makefile.in	2005-07-20 17:20:11.000000000 -0400
++++ kdelibs-3.4.2/kdeui/colors/Makefile.in	2005-08-16 10:58:35.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -215,6 +215,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -12968,9 +14203,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kdeui/kdetrayproxy/Makefile.in kdelibs-3.4.2/kdeui/kdetrayproxy/Makefile.in
---- kdelibs-3.4.2.orig/kdeui/kdetrayproxy/Makefile.in	2005-07-20 21:20:11.000000000 +0000
-+++ kdelibs-3.4.2/kdeui/kdetrayproxy/Makefile.in	2005-07-26 18:49:46.050796176 +0000
-@@ -266,6 +266,9 @@
+--- kdelibs-3.4.2.orig/kdeui/kdetrayproxy/Makefile.in	2005-07-20 17:20:11.000000000 -0400
++++ kdelibs-3.4.2/kdeui/kdetrayproxy/Makefile.in	2005-08-16 10:58:35.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kded_kdetrayproxy_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -266,6 +264,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12980,7 +14230,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -516,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12989,7 +14239,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -554,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13002,9 +14252,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdeui/Makefile.in kdelibs-3.4.2/kdeui/Makefile.in
---- kdelibs-3.4.2.orig/kdeui/Makefile.in	2005-07-20 21:20:11.000000000 +0000
-+++ kdelibs-3.4.2/kdeui/Makefile.in	2005-07-26 18:49:45.000000000 +0000
-@@ -376,6 +376,9 @@
+--- kdelibs-3.4.2.orig/kdeui/Makefile.in	2005-07-20 17:20:11.000000000 -0400
++++ kdelibs-3.4.2/kdeui/Makefile.in	2005-08-16 10:58:35.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -37,8 +37,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkdeui_la_SOURCES) $(libkspell_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -376,6 +374,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13014,7 +14279,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -791,7 +794,7 @@
+@@ -791,7 +792,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13023,7 +14288,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -829,9 +832,9 @@
+@@ -829,9 +830,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13035,7 +14300,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1633,11 +1636,11 @@
+@@ -1633,11 +1634,11 @@
  mocs: kcompletionbox.moc
  
  #>+ 3
@@ -13050,7 +14315,7 @@
  
  #>+ 3
  kactionclasses.moc: $(srcdir)/kactionclasses.h
-@@ -1647,11 +1650,11 @@
+@@ -1647,11 +1648,11 @@
  mocs: kactionclasses.moc
  
  #>+ 3
@@ -13065,7 +14330,7 @@
  
  #>+ 3
  kshortcutdialog.moc: $(srcdir)/kshortcutdialog.h
-@@ -1675,18 +1678,18 @@
+@@ -1675,18 +1676,18 @@
  mocs: kdialogbase.moc
  
  #>+ 3
@@ -13090,7 +14355,7 @@
  
  #>+ 3
  kbuttonbox.moc: $(srcdir)/kbuttonbox.h
-@@ -1745,13 +1748,6 @@
+@@ -1745,13 +1746,6 @@
  mocs: kpassdlg.moc
  
  #>+ 3
@@ -13104,7 +14369,7 @@
  klineeditdlg.moc: $(srcdir)/klineeditdlg.h
  	$(MOC) $(srcdir)/klineeditdlg.h -o klineeditdlg.moc
  
-@@ -1759,11 +1755,11 @@
+@@ -1759,11 +1753,11 @@
  mocs: klineeditdlg.moc
  
  #>+ 3
@@ -13119,7 +14384,7 @@
  
  #>+ 3
  kkeybutton.moc: $(srcdir)/kkeybutton.h
-@@ -1773,6 +1769,13 @@
+@@ -1773,6 +1767,13 @@
  mocs: kkeybutton.moc
  
  #>+ 3
@@ -13133,7 +14398,7 @@
  kpopupmenu.moc: $(srcdir)/kpopupmenu.h
  	$(MOC) $(srcdir)/kpopupmenu.h -o kpopupmenu.moc
  
-@@ -1787,18 +1790,18 @@
+@@ -1787,18 +1788,18 @@
  mocs: kmainwindow.moc
  
  #>+ 3
@@ -13158,7 +14423,7 @@
  
  #>+ 3
  ktabwidget.moc: $(srcdir)/ktabwidget.h
-@@ -1836,6 +1839,13 @@
+@@ -1836,6 +1837,13 @@
  mocs: kaction.moc
  
  #>+ 3
@@ -13172,7 +14437,7 @@
  kiconviewsearchline.moc: $(srcdir)/kiconviewsearchline.h
  	$(MOC) $(srcdir)/kiconviewsearchline.h -o kiconviewsearchline.moc
  
-@@ -1850,11 +1860,11 @@
+@@ -1850,11 +1858,11 @@
  mocs: ktextbrowser.moc
  
  #>+ 3
@@ -13187,7 +14452,7 @@
  
  #>+ 3
  khelpmenu.moc: $(srcdir)/khelpmenu.h
-@@ -1864,13 +1874,6 @@
+@@ -1864,13 +1872,6 @@
  mocs: khelpmenu.moc
  
  #>+ 3
@@ -13201,7 +14466,7 @@
  kdatewidget.moc: $(srcdir)/kdatewidget.h
  	$(MOC) $(srcdir)/kdatewidget.h -o kdatewidget.moc
  
-@@ -1885,13 +1888,6 @@
+@@ -1885,13 +1886,6 @@
  mocs: ktoolbarradiogroup.moc
  
  #>+ 3
@@ -13215,7 +14480,7 @@
  kaboutdialog_private.moc: $(srcdir)/kaboutdialog_private.h
  	$(MOC) $(srcdir)/kaboutdialog_private.h -o kaboutdialog_private.moc
  
-@@ -1906,18 +1902,18 @@
+@@ -1906,18 +1900,18 @@
  mocs: kanimwidget.moc
  
  #>+ 3
@@ -13240,7 +14505,7 @@
  
  #>+ 3
  ktimewidget.moc: $(srcdir)/ktimewidget.h
-@@ -1927,11 +1923,11 @@
+@@ -1927,11 +1921,11 @@
  mocs: ktimewidget.moc
  
  #>+ 3
@@ -13255,7 +14520,7 @@
  
  #>+ 3
  klistviewsearchline.moc: $(srcdir)/klistviewsearchline.h
-@@ -1941,6 +1937,13 @@
+@@ -1941,6 +1935,13 @@
  mocs: klistviewsearchline.moc
  
  #>+ 3
@@ -13269,7 +14534,7 @@
  klanguagebutton.moc: $(srcdir)/klanguagebutton.h
  	$(MOC) $(srcdir)/klanguagebutton.h -o klanguagebutton.moc
  
-@@ -1983,18 +1986,18 @@
+@@ -1983,18 +1984,18 @@
  mocs: kfontdialog.moc
  
  #>+ 3
@@ -13294,7 +14559,7 @@
  
  #>+ 3
  kurllabel.moc: $(srcdir)/kurllabel.h
-@@ -2053,18 +2056,18 @@
+@@ -2053,18 +2054,18 @@
  mocs: kedittoolbar.moc
  
  #>+ 3
@@ -13319,7 +14584,7 @@
  
  #>+ 3
  klineedit.moc: $(srcdir)/klineedit.h
-@@ -2242,13 +2245,6 @@
+@@ -2242,13 +2243,6 @@
  mocs: kwindowlistmenu.moc
  
  #>+ 3
@@ -13333,7 +14598,7 @@
  kdockwidget_private.moc: $(srcdir)/kdockwidget_private.h
  	$(MOC) $(srcdir)/kdockwidget_private.h -o kdockwidget_private.moc
  
-@@ -2263,6 +2259,13 @@
+@@ -2263,6 +2257,13 @@
  mocs: kfontcombo.moc
  
  #>+ 3
@@ -13347,7 +14612,7 @@
  kcolordialog.moc: $(srcdir)/kcolordialog.h
  	$(MOC) $(srcdir)/kcolordialog.h -o kcolordialog.moc
  
-@@ -2350,7 +2353,7 @@
+@@ -2350,7 +2351,7 @@
  
  #>+ 3
  clean-metasources:
@@ -13356,7 +14621,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 
-@@ -2413,7 +2416,7 @@
+@@ -2413,7 +2414,7 @@
  
  
  #>+ 11
@@ -13366,9 +14631,24 @@
  	rm -f libkdeui_la.all_cpp.files libkdeui_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeui_la.all_cpp.final; \
 diff -Nru kdelibs-3.4.2.orig/kdeui/tests/Makefile.in kdelibs-3.4.2/kdeui/tests/Makefile.in
---- kdelibs-3.4.2.orig/kdeui/tests/Makefile.in	2005-07-20 21:20:11.000000000 +0000
-+++ kdelibs-3.4.2/kdeui/tests/Makefile.in	2005-07-26 18:49:46.478731120 +0000
-@@ -691,6 +691,9 @@
+--- kdelibs-3.4.2.orig/kdeui/tests/Makefile.in	2005-07-20 17:20:11.000000000 -0400
++++ kdelibs-3.4.2/kdeui/tests/Makefile.in	2005-08-16 10:58:36.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -33,8 +33,6 @@
+ #    along with this library; see the file COPYING.LIB.  If not, write to
+ #    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ #    Boston, MA 02111-1307, 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@
+@@ -691,6 +689,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13378,7 +14658,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -993,7 +996,7 @@
+@@ -993,7 +994,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13387,7 +14667,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -1031,9 +1034,9 @@
+@@ -1031,9 +1032,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13399,7 +14679,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-@@ -1486,18 +1489,18 @@
+@@ -1486,18 +1487,18 @@
  .NOEXPORT:
  
  #>+ 3
@@ -13424,7 +14704,7 @@
  
  #>+ 3
  kstatusbartest.moc: $(srcdir)/kstatusbartest.h
-@@ -1521,18 +1524,18 @@
+@@ -1521,18 +1522,18 @@
  mocs: khashtest.moc
  
  #>+ 3
@@ -13449,7 +14729,7 @@
  
  #>+ 3
  kcompletiontest.moc: $(srcdir)/kcompletiontest.h
-@@ -1605,18 +1608,18 @@
+@@ -1605,18 +1606,18 @@
  mocs: kdesattest.moc
  
  #>+ 3
@@ -13474,7 +14754,7 @@
  
  #>+ 3
  kunbalancedgrdtest.moc: $(srcdir)/kunbalancedgrdtest.h
-@@ -1634,7 +1637,7 @@
+@@ -1634,7 +1635,7 @@
  
  #>+ 3
  clean-metasources:
@@ -13484,9 +14764,24 @@
  #>+ 2
  KDE_DIST=kdockwidgettest.h background_1.png kmainwindowtest.h Makefile.in kmainwindowrestoretest.h ktoolbarlabelactiontestui.rc ktabwidgettest.h kcompletiontest.h kstatusbartest.h kxmlguitest_shell.rc kunbalancedgrdtest.h ktabctltest.h kdocktest.h knuminputtest.h kdualcolortest.h RayTracedGear.png 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 
 diff -Nru kdelibs-3.4.2.orig/kdewidgets/Makefile.in kdelibs-3.4.2/kdewidgets/Makefile.in
---- kdelibs-3.4.2.orig/kdewidgets/Makefile.in	2005-07-20 21:20:11.000000000 +0000
-+++ kdelibs-3.4.2/kdewidgets/Makefile.in	2005-07-26 18:49:46.619709688 +0000
-@@ -304,6 +304,9 @@
+--- kdelibs-3.4.2.orig/kdewidgets/Makefile.in	2005-07-20 17:20:11.000000000 -0400
++++ kdelibs-3.4.2/kdewidgets/Makefile.in	2005-08-16 10:58:36.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(kdewidgets_la_SOURCES) $(makekdewidgets_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -304,6 +302,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13496,7 +14791,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -554,7 +555,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13505,7 +14800,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +593,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13518,8 +14813,14 @@
  install-kde_widgetLTLIBRARIES: $(kde_widget_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kdewidgets/pics/Makefile.in kdelibs-3.4.2/kdewidgets/pics/Makefile.in
---- kdelibs-3.4.2.orig/kdewidgets/pics/Makefile.in	2005-07-20 21:20:11.000000000 +0000
-+++ kdelibs-3.4.2/kdewidgets/pics/Makefile.in	2005-07-26 18:49:46.637706952 +0000
+--- kdelibs-3.4.2.orig/kdewidgets/pics/Makefile.in	2005-07-20 17:20:11.000000000 -0400
++++ kdelibs-3.4.2/kdewidgets/pics/Makefile.in	2005-08-16 10:58:36.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -13552,8 +14853,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kdewidgets/tests/Makefile.in kdelibs-3.4.2/kdewidgets/tests/Makefile.in
---- kdelibs-3.4.2.orig/kdewidgets/tests/Makefile.in	2005-07-20 21:20:11.000000000 +0000
-+++ kdelibs-3.4.2/kdewidgets/tests/Makefile.in	2005-07-26 18:49:46.652704672 +0000
+--- kdelibs-3.4.2.orig/kdewidgets/tests/Makefile.in	2005-07-20 17:20:11.000000000 -0400
++++ kdelibs-3.4.2/kdewidgets/tests/Makefile.in	2005-08-16 10:58:36.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -234,6 +234,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -13586,9 +14893,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kdoctools/Makefile.in kdelibs-3.4.2/kdoctools/Makefile.in
---- kdelibs-3.4.2.orig/kdoctools/Makefile.in	2005-07-20 21:20:12.000000000 +0000
-+++ kdelibs-3.4.2/kdoctools/Makefile.in	2005-07-26 18:49:46.000000000 +0000
-@@ -301,6 +301,9 @@
+--- kdelibs-3.4.2.orig/kdoctools/Makefile.in	2005-07-20 17:20:12.000000000 -0400
++++ kdelibs-3.4.2/kdoctools/Makefile.in	2005-08-16 10:58:36.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -19,8 +19,6 @@
+ 
+ 
+ 
+-SOURCES = $(kio_ghelp_la_SOURCES) $(kio_help_la_SOURCES) $(libkbzipfilter_dummy_la_SOURCES) $(meinproc_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13598,7 +14920,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -565,7 +566,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13607,7 +14929,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -603,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13620,9 +14942,24 @@
  checkXML: $(top_builddir)/config.status $(srcdir)/checkXML.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 diff -Nru kdelibs-3.4.2.orig/khtml/css/Makefile.in kdelibs-3.4.2/khtml/css/Makefile.in
---- kdelibs-3.4.2.orig/khtml/css/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/css/Makefile.in	2005-07-26 18:49:50.000000000 +0000
-@@ -286,6 +286,9 @@
+--- kdelibs-3.4.2.orig/khtml/css/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/css/Makefile.in	2005-08-16 10:58:39.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -36,8 +36,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkhtmlcss_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13632,7 +14969,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +554,7 @@
+@@ -551,7 +552,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13641,7 +14978,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +592,9 @@
+@@ -589,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13653,7 +14990,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -859,7 +862,7 @@
+@@ -859,7 +860,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -13663,9 +15000,24 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/khtml/dom/Makefile.in kdelibs-3.4.2/khtml/dom/Makefile.in
---- kdelibs-3.4.2.orig/khtml/dom/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/dom/Makefile.in	2005-07-26 18:49:50.000000000 +0000
-@@ -292,6 +292,9 @@
+--- kdelibs-3.4.2.orig/khtml/dom/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/dom/Makefile.in	2005-08-16 10:58:40.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(libkhtmldom_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13675,7 +15027,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -562,7 +563,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13684,7 +15036,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -600,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13697,9 +15049,24 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/khtml/ecma/Makefile.in kdelibs-3.4.2/khtml/ecma/Makefile.in
---- kdelibs-3.4.2.orig/khtml/ecma/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/ecma/Makefile.in	2005-07-26 18:49:50.000000000 +0000
-@@ -279,6 +279,9 @@
+--- kdelibs-3.4.2.orig/khtml/ecma/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/ecma/Makefile.in	2005-08-16 10:58:40.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -34,8 +34,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(libkjs_html_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13709,7 +15076,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -539,7 +540,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13718,7 +15085,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -577,9 +578,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13731,9 +15098,24 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/khtml/html/Makefile.in kdelibs-3.4.2/khtml/html/Makefile.in
---- kdelibs-3.4.2.orig/khtml/html/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/html/Makefile.in	2005-07-26 18:49:50.000000000 +0000
-@@ -280,6 +280,9 @@
+--- kdelibs-3.4.2.orig/khtml/html/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/html/Makefile.in	2005-08-16 10:58:40.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(libkhtmlhtml_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13743,7 +15125,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -544,7 +545,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13752,7 +15134,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +583,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13765,9 +15147,24 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/khtml/java/dummy/Makefile.in kdelibs-3.4.2/khtml/java/dummy/Makefile.in
---- kdelibs-3.4.2.orig/khtml/java/dummy/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/java/dummy/Makefile.in	2005-07-26 18:49:50.000000000 +0000
-@@ -255,6 +255,9 @@
+--- kdelibs-3.4.2.orig/khtml/java/dummy/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/java/dummy/Makefile.in	2005-08-16 10:58:40.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(libkjava_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -255,6 +253,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13777,7 +15174,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,7 +500,7 @@
+@@ -497,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13786,7 +15183,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -535,9 +538,9 @@
+@@ -535,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13799,9 +15196,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/khtml/java/Makefile.in kdelibs-3.4.2/khtml/java/Makefile.in
---- kdelibs-3.4.2.orig/khtml/java/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/java/Makefile.in	2005-07-26 18:49:50.000000000 +0000
-@@ -297,6 +297,9 @@
+--- kdelibs-3.4.2.orig/khtml/java/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/java/Makefile.in	2005-08-16 10:58:40.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kjavaappletviewer_la_SOURCES) $(libkjava_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -297,6 +295,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13811,7 +15223,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -566,7 +567,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13820,7 +15232,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -604,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13832,7 +15244,7 @@
  	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)/$@
-@@ -1052,13 +1055,6 @@
+@@ -1052,13 +1053,6 @@
  mocs: kjavaapplet.moc
  
  #>+ 3
@@ -13846,7 +15258,7 @@
  kjavaappletserver.moc: $(srcdir)/kjavaappletserver.h
  	$(MOC) $(srcdir)/kjavaappletserver.h -o kjavaappletserver.moc
  
-@@ -1066,11 +1062,11 @@
+@@ -1066,11 +1060,11 @@
  mocs: kjavaappletserver.moc
  
  #>+ 3
@@ -13861,7 +15273,7 @@
  
  #>+ 3
  kjavaprocess.moc: $(srcdir)/kjavaprocess.h
-@@ -1080,6 +1076,13 @@
+@@ -1080,6 +1074,13 @@
  mocs: kjavaprocess.moc
  
  #>+ 3
@@ -13875,7 +15287,7 @@
  kjavaappletviewer.moc: $(srcdir)/kjavaappletviewer.h
  	$(MOC) $(srcdir)/kjavaappletviewer.h -o kjavaappletviewer.moc
  
-@@ -1097,7 +1100,7 @@
+@@ -1097,7 +1098,7 @@
  
  #>+ 3
  clean-metasources:
@@ -13884,7 +15296,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 
-@@ -1148,7 +1151,7 @@
+@@ -1148,7 +1149,7 @@
  
  
  #>+ 11
@@ -13893,7 +15305,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; \
-@@ -1160,7 +1163,7 @@
+@@ -1160,7 +1161,7 @@
  	rm -f kjavaappletviewer_la.all_cpp.final kjavaappletviewer_la.all_cpp.files
  
  #>+ 11
@@ -13902,7 +15314,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; \
-@@ -1204,8 +1207,8 @@
+@@ -1204,8 +1205,8 @@
  kjavaappletcontext.lo: kjavaappletcontext.moc 
  kjavaprocess.o: kjavaprocess.moc 
  kjavaappletserver.o: kjavaappletserver.moc 
@@ -13913,9 +15325,24 @@
  kjavaapplet.lo: kjavaapplet.moc 
  nmcheck: 
 diff -Nru kdelibs-3.4.2.orig/khtml/java/tests/Makefile.in kdelibs-3.4.2/khtml/java/tests/Makefile.in
---- kdelibs-3.4.2.orig/khtml/java/tests/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/java/tests/Makefile.in	2005-07-26 18:49:50.000000000 +0000
-@@ -246,6 +246,9 @@
+--- kdelibs-3.4.2.orig/khtml/java/tests/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/java/tests/Makefile.in	2005-08-16 10:58:41.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-SOURCES = $(testserver_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -246,6 +244,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13925,7 +15352,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -491,7 +492,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13934,7 +15361,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -529,9 +530,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13947,9 +15374,24 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/khtml/kmultipart/Makefile.in kdelibs-3.4.2/khtml/kmultipart/Makefile.in
---- kdelibs-3.4.2.orig/khtml/kmultipart/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/kmultipart/Makefile.in	2005-07-26 18:49:50.000000000 +0000
-@@ -259,6 +259,9 @@
+--- kdelibs-3.4.2.orig/khtml/kmultipart/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/kmultipart/Makefile.in	2005-08-16 10:58:41.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkmultipart_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -259,6 +257,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13959,7 +15401,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13968,7 +15410,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13981,9 +15423,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/khtml/Makefile.in kdelibs-3.4.2/khtml/Makefile.in
---- kdelibs-3.4.2.orig/khtml/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/Makefile.in	2005-07-26 18:49:49.000000000 +0000
-@@ -362,6 +362,9 @@
+--- kdelibs-3.4.2.orig/khtml/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/Makefile.in	2005-08-16 10:58:39.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -36,8 +36,6 @@
+ 
+ 
+ 
+-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@
+@@ -362,6 +360,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13993,7 +15450,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -676,7 +679,7 @@
+@@ -676,7 +677,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -14002,7 +15459,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -714,9 +717,9 @@
+@@ -714,9 +715,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14015,9 +15472,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/khtml/misc/Makefile.in kdelibs-3.4.2/khtml/misc/Makefile.in
---- kdelibs-3.4.2.orig/khtml/misc/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/misc/Makefile.in	2005-07-26 18:49:50.000000000 +0000
-@@ -275,6 +275,9 @@
+--- kdelibs-3.4.2.orig/khtml/misc/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/misc/Makefile.in	2005-08-16 10:58:41.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(libkhtmlmisc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -275,6 +273,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14027,7 +15499,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -531,7 +532,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14036,7 +15508,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -569,9 +570,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14049,8 +15521,14 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/khtml/pics/Makefile.in kdelibs-3.4.2/khtml/pics/Makefile.in
---- kdelibs-3.4.2.orig/khtml/pics/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/pics/Makefile.in	2005-07-26 18:49:50.000000000 +0000
+--- kdelibs-3.4.2.orig/khtml/pics/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/pics/Makefile.in	2005-08-16 10:58:42.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -215,6 +215,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -14137,9 +15615,24 @@
  
  #>+ 15
 diff -Nru kdelibs-3.4.2.orig/khtml/rendering/Makefile.in kdelibs-3.4.2/khtml/rendering/Makefile.in
---- kdelibs-3.4.2.orig/khtml/rendering/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/rendering/Makefile.in	2005-07-26 18:49:51.000000000 +0000
-@@ -288,6 +288,9 @@
+--- kdelibs-3.4.2.orig/khtml/rendering/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/rendering/Makefile.in	2005-08-16 10:58:43.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(libkhtmlrender_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14149,7 +15642,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -553,7 +554,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14158,7 +15651,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -591,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14170,7 +15663,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -855,18 +858,18 @@
+@@ -855,18 +856,18 @@
  .NOEXPORT:
  
  #>+ 3
@@ -14195,7 +15688,7 @@
  
  #>+ 3
  render_frames.moc: $(srcdir)/render_frames.h
-@@ -884,7 +887,7 @@
+@@ -884,7 +885,7 @@
  
  #>+ 3
  clean-metasources:
@@ -14204,7 +15697,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 
-@@ -931,7 +934,7 @@
+@@ -931,7 +932,7 @@
  
  
  #>+ 11
@@ -14213,7 +15706,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; \
-@@ -977,7 +980,7 @@
+@@ -977,7 +978,7 @@
  render_replaced.o: render_replaced.moc 
  nmcheck-am: nmcheck
  render_replaced.lo: render_replaced.moc 
@@ -14223,9 +15716,24 @@
  render_frames.lo: render_frames.moc 
  render_layer.lo: render_layer.moc 
 diff -Nru kdelibs-3.4.2.orig/khtml/xml/Makefile.in kdelibs-3.4.2/khtml/xml/Makefile.in
---- kdelibs-3.4.2.orig/khtml/xml/Makefile.in	2005-07-20 21:20:13.000000000 +0000
-+++ kdelibs-3.4.2/khtml/xml/Makefile.in	2005-07-26 18:49:51.000000000 +0000
-@@ -278,6 +278,9 @@
+--- kdelibs-3.4.2.orig/khtml/xml/Makefile.in	2005-07-20 17:20:13.000000000 -0400
++++ kdelibs-3.4.2/khtml/xml/Makefile.in	2005-08-16 10:58:43.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(libkhtmlxml_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14235,7 +15743,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +542,7 @@
+@@ -539,7 +540,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14244,7 +15752,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +580,9 @@
+@@ -577,9 +578,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14257,9 +15765,24 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/kimgio/Makefile.in kdelibs-3.4.2/kimgio/Makefile.in
---- kdelibs-3.4.2.orig/kimgio/Makefile.in	2005-07-20 21:20:14.000000000 +0000
-+++ kdelibs-3.4.2/kimgio/Makefile.in	2005-07-26 18:49:51.000000000 +0000
-@@ -337,6 +337,9 @@
+--- kdelibs-3.4.2.orig/kimgio/Makefile.in	2005-07-20 17:20:14.000000000 -0400
++++ kdelibs-3.4.2/kimgio/Makefile.in	2005-08-16 10:58:43.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kimg_dds_la_SOURCES) $(kimg_eps_la_SOURCES) $(kimg_exr_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@
+@@ -337,6 +335,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14269,7 +15792,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -662,7 +665,7 @@
+@@ -662,7 +663,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14278,7 +15801,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -700,9 +703,9 @@
+@@ -700,9 +701,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14291,9 +15814,43 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kinit/Makefile.in kdelibs-3.4.2/kinit/Makefile.in
---- kdelibs-3.4.2.orig/kinit/Makefile.in	2005-07-20 21:20:14.000000000 +0000
-+++ kdelibs-3.4.2/kinit/Makefile.in	2005-07-26 18:49:52.000000000 +0000
-@@ -364,6 +364,9 @@
+--- kdelibs-3.4.2.orig/kinit/Makefile.in	2005-07-20 17:20:14.000000000 -0400
++++ kdelibs-3.4.2/kinit/Makefile.in	2005-08-16 10:58:44.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -34,10 +34,6 @@
+ 
+ 
+ 
+-#>- SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) $(kioslave_SOURCES) $(kshell_SOURCES) $(kwrapper_SOURCES) $(lnusertemp_SOURCES)
+-#>+ 1
+-SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) $(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) $(kioslave_SOURCES) $(kshell_SOURCES) $(kwrapper_SOURCES) $(lnusertemp_SOURCES) $(klauncher_SOURCES) 
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -171,10 +167,15 @@
+ #>+ 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) \
++#>- 	$(kioslave_SOURCES) $(kshell_SOURCES) $(kwrapper_SOURCES) \
++#>- 	$(lnusertemp_SOURCES)
++#>+ 4
+ SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) \
+ 	$(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) \
+ 	$(kioslave_SOURCES) $(kshell_SOURCES) $(kwrapper_SOURCES) \
+-	$(lnusertemp_SOURCES)
++	$(lnusertemp_SOURCES) $(klauncher_SOURCES) 
+ #>- DIST_SOURCES = $(klauncher_la_SOURCES) $(kdeinit_SOURCES) \
+ #>- 	$(kdeinit_shutdown_SOURCES) $(kdeinit_wrapper_SOURCES) \
+ #>- 	$(kioslave_SOURCES) $(kshell_SOURCES) $(kwrapper_SOURCES) \
+@@ -364,6 +365,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14303,7 +15860,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -641,7 +644,7 @@
+@@ -641,7 +645,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -14312,7 +15869,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -679,9 +682,9 @@
+@@ -679,9 +683,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14325,9 +15882,24 @@
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kinit/tests/Makefile.in kdelibs-3.4.2/kinit/tests/Makefile.in
---- kdelibs-3.4.2.orig/kinit/tests/Makefile.in	2005-07-20 21:20:14.000000000 +0000
-+++ kdelibs-3.4.2/kinit/tests/Makefile.in	2005-07-26 18:49:52.000000000 +0000
-@@ -249,6 +249,9 @@
+--- kdelibs-3.4.2.orig/kinit/tests/Makefile.in	2005-07-20 17:20:14.000000000 -0400
++++ kdelibs-3.4.2/kinit/tests/Makefile.in	2005-08-16 10:58:44.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ # $Id: Makefile.am 157691 2002-05-25 18:00:11Z coolo $
+-SOURCES = $(klaunchertest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -249,6 +247,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14337,7 +15909,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -491,7 +492,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14346,7 +15918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -529,9 +530,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14359,9 +15931,24 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/kio/bookmarks/Makefile.in kdelibs-3.4.2/kio/bookmarks/Makefile.in
---- kdelibs-3.4.2.orig/kio/bookmarks/Makefile.in	2005-07-20 21:20:14.000000000 +0000
-+++ kdelibs-3.4.2/kio/bookmarks/Makefile.in	2005-07-26 18:49:52.000000000 +0000
-@@ -289,6 +289,9 @@
+--- kdelibs-3.4.2.orig/kio/bookmarks/Makefile.in	2005-07-20 17:20:14.000000000 -0400
++++ kdelibs-3.4.2/kio/bookmarks/Makefile.in	2005-08-16 10:58:45.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -34,8 +34,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(libkbookmarks_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14371,7 +15958,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -553,7 +556,7 @@
+@@ -553,7 +554,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -14380,7 +15967,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +594,9 @@
+@@ -591,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14393,9 +15980,24 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/kio/httpfilter/Makefile.in kdelibs-3.4.2/kio/httpfilter/Makefile.in
---- kdelibs-3.4.2.orig/kio/httpfilter/Makefile.in	2005-07-20 21:20:14.000000000 +0000
-+++ kdelibs-3.4.2/kio/httpfilter/Makefile.in	2005-07-26 18:49:52.000000000 +0000
-@@ -248,6 +248,9 @@
+--- kdelibs-3.4.2.orig/kio/httpfilter/Makefile.in	2005-07-20 17:20:14.000000000 -0400
++++ kdelibs-3.4.2/kio/httpfilter/Makefile.in	2005-08-16 10:58:45.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(libhttpfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -248,6 +246,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14405,7 +16007,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -493,7 +494,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -14414,7 +16016,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -531,9 +532,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14427,9 +16029,24 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/kio/kfile/Makefile.in kdelibs-3.4.2/kio/kfile/Makefile.in
---- kdelibs-3.4.2.orig/kio/kfile/Makefile.in	2005-07-20 21:20:15.000000000 +0000
-+++ kdelibs-3.4.2/kio/kfile/Makefile.in	2005-07-26 18:49:53.000000000 +0000
-@@ -305,6 +305,9 @@
+--- kdelibs-3.4.2.orig/kio/kfile/Makefile.in	2005-07-20 17:20:15.000000000 -0400
++++ kdelibs-3.4.2/kio/kfile/Makefile.in	2005-08-16 10:58:45.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkfile_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -305,6 +303,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14439,7 +16056,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -606,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14448,7 +16065,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14460,7 +16077,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -955,6 +958,13 @@
+@@ -955,6 +956,13 @@
  .NOEXPORT:
  
  #>+ 3
@@ -14474,7 +16091,7 @@
  knotifydialog.moc: $(srcdir)/knotifydialog.h
  	$(MOC) $(srcdir)/knotifydialog.h -o knotifydialog.moc
  
-@@ -969,218 +979,211 @@
+@@ -969,218 +977,211 @@
  mocs: kurlbar.moc
  
  #>+ 3
@@ -14781,7 +16398,7 @@
  
  #>+ 2
  KDE_DIST=Makefile.in kpropsdlgplugin.desktop kpropertiesmimetypebase.ui kpropertiesdesktopbase.ui kpropertiesdesktopadvbase.ui kfilemetapreview.h knotifywidgetbase.ui Makefile.am 
-@@ -1235,7 +1238,7 @@
+@@ -1235,7 +1236,7 @@
  
  
  #>+ 11
@@ -14790,7 +16407,7 @@
  	@echo 'creating libkfile_la.all_cpp.cpp ...'; \
  	rm -f libkfile_la.all_cpp.files libkfile_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkfile_la.all_cpp.final; \
-@@ -1284,9 +1287,9 @@
+@@ -1284,9 +1285,9 @@
  kpropertiesdesktopbase.cpp: $(srcdir)/../kio/kdirnotify_stub.h 
  $(srcdir)/kfilemetapreview.cpp: knotifywidgetbase.h kpropertiesdesktopbase.h kpropertiesdesktopadvbase.h kpropertiesmimetypebase.h $(srcdir)/../kio/kdirnotify_stub.h 
  kfiletreeview.lo: kfiletreeview.moc 
@@ -14801,7 +16418,7 @@
  kfiletreeview.o: kfiletreeview.moc 
  $(srcdir)/kfiletreeview.cpp: knotifywidgetbase.h kpropertiesdesktopbase.h kpropertiesdesktopadvbase.h kpropertiesmimetypebase.h $(srcdir)/../kio/kdirnotify_stub.h 
  kfiletreebranch.lo: kfiletreebranch.moc 
-@@ -1322,8 +1325,8 @@
+@@ -1322,8 +1323,8 @@
  kdiroperator.lo: kdiroperator.moc 
  kdirsize.lo: kdirsize.moc 
  knotifydialog.o: knotifydialog.moc 
@@ -14811,7 +16428,7 @@
  $(srcdir)/kicondialog.cpp: knotifywidgetbase.h kpropertiesdesktopbase.h kpropertiesdesktopadvbase.h kpropertiesmimetypebase.h $(srcdir)/../kio/kdirnotify_stub.h 
  kurlbar.lo: kurlbar.moc 
  $(srcdir)/kdiroperator.cpp: knotifywidgetbase.h kpropertiesdesktopbase.h kpropertiesdesktopadvbase.h kpropertiesmimetypebase.h $(srcdir)/../kio/kdirnotify_stub.h 
-@@ -1344,10 +1347,10 @@
+@@ -1344,10 +1345,10 @@
  $(srcdir)/kimagefilepreview.cpp: knotifywidgetbase.h kpropertiesdesktopbase.h kpropertiesdesktopadvbase.h kpropertiesmimetypebase.h $(srcdir)/../kio/kdirnotify_stub.h 
  kurlbar.o: kurlbar.moc 
  $(srcdir)/kfilespeedbar.cpp: knotifywidgetbase.h kpropertiesdesktopbase.h kpropertiesdesktopadvbase.h kpropertiesmimetypebase.h $(srcdir)/../kio/kdirnotify_stub.h 
@@ -14825,9 +16442,24 @@
  $(srcdir)/kpropertiesdialog.cpp: knotifywidgetbase.h kpropertiesdesktopbase.h kpropertiesdesktopadvbase.h kpropertiesmimetypebase.h $(srcdir)/../kio/kdirnotify_stub.h 
  kurlrequester.o: kurlrequester.moc 
 diff -Nru kdelibs-3.4.2.orig/kio/kfile/tests/Makefile.in kdelibs-3.4.2/kio/kfile/tests/Makefile.in
---- kdelibs-3.4.2.orig/kio/kfile/tests/Makefile.in	2005-07-20 21:20:15.000000000 +0000
-+++ kdelibs-3.4.2/kio/kfile/tests/Makefile.in	2005-07-26 18:49:53.000000000 +0000
-@@ -323,6 +323,9 @@
+--- kdelibs-3.4.2.orig/kio/kfile/tests/Makefile.in	2005-07-20 17:20:15.000000000 -0400
++++ kdelibs-3.4.2/kio/kfile/tests/Makefile.in	2005-08-16 10:58:45.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -33,8 +33,6 @@
+ #    along with this library; see the file COPYING.LIB.  If not, write to
+ #    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ #    Boston, MA 02111-1307, 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@
+@@ -323,6 +321,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14837,7 +16469,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -576,7 +577,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14846,7 +16478,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -614,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14859,9 +16491,24 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/kio/kio/Makefile.in kdelibs-3.4.2/kio/kio/Makefile.in
---- kdelibs-3.4.2.orig/kio/kio/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/kio/Makefile.in	2005-07-26 18:49:55.000000000 +0000
-@@ -333,6 +333,9 @@
+--- kdelibs-3.4.2.orig/kio/kio/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/kio/Makefile.in	2005-08-16 10:58:46.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -34,8 +34,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(libkiocore_la_SOURCES) $(libksycoca_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -333,6 +331,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14871,7 +16518,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -681,7 +684,7 @@
+@@ -681,7 +682,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -14880,7 +16527,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -719,9 +722,9 @@
+@@ -719,9 +720,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14892,7 +16539,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -1157,13 +1160,6 @@
+@@ -1157,13 +1158,6 @@
  mocs: slave.moc
  
  #>+ 3
@@ -14906,7 +16553,7 @@
  kshred.moc: $(srcdir)/kshred.h
  	$(MOC) $(srcdir)/kshred.h -o kshred.moc
  
-@@ -1171,11 +1167,11 @@
+@@ -1171,11 +1165,11 @@
  mocs: kshred.moc
  
  #>+ 3
@@ -14921,7 +16568,7 @@
  
  #>+ 3
  kurifilter.moc: $(srcdir)/kurifilter.h
-@@ -1185,6 +1181,13 @@
+@@ -1185,6 +1179,13 @@
  mocs: kurifilter.moc
  
  #>+ 3
@@ -14935,7 +16582,7 @@
  defaultprogress.moc: $(srcdir)/defaultprogress.h
  	$(MOC) $(srcdir)/defaultprogress.h -o defaultprogress.moc
  
-@@ -1304,6 +1307,13 @@
+@@ -1304,6 +1305,13 @@
  mocs: krun.moc
  
  #>+ 3
@@ -14949,7 +16596,7 @@
  kfilterbase.moc: $(srcdir)/kfilterbase.h
  	$(MOC) $(srcdir)/kfilterbase.h -o kfilterbase.moc
  
-@@ -1311,11 +1321,11 @@
+@@ -1311,11 +1319,11 @@
  mocs: kfilterbase.moc
  
  #>+ 3
@@ -14964,7 +16611,7 @@
  
  #>+ 3
  knfsshare.moc: $(srcdir)/knfsshare.h
-@@ -1332,13 +1342,6 @@
+@@ -1332,13 +1340,6 @@
  mocs: kdirlister_p.moc
  
  #>+ 3
@@ -14978,7 +16625,7 @@
  kdirwatch.moc: $(srcdir)/kdirwatch.h
  	$(MOC) $(srcdir)/kdirwatch.h -o kdirwatch.moc
  
-@@ -1353,18 +1356,18 @@
+@@ -1353,18 +1354,18 @@
  mocs: ksambashare.moc
  
  #>+ 3
@@ -15003,7 +16650,7 @@
  
  #>+ 3
  passdlg.moc: $(srcdir)/passdlg.h
-@@ -1381,18 +1384,18 @@
+@@ -1381,18 +1382,18 @@
  mocs: renamedlg.moc
  
  #>+ 3
@@ -15028,7 +16675,7 @@
  
  #>+ 3
  kscan.moc: $(srcdir)/kscan.h
-@@ -1403,7 +1406,7 @@
+@@ -1403,7 +1404,7 @@
  
  #>+ 3
  clean-metasources:
@@ -15037,7 +16684,7 @@
  
  #>+ 2
  KDE_DIST=lex.l Makefile.in configure.in.in klimitediodevice.h KFILEMETAINFO_ISSUES yacc.y Makefile.am kservicegroupfactory.h 
-@@ -1458,7 +1461,7 @@
+@@ -1458,7 +1459,7 @@
  
  
  #>+ 11
@@ -15046,7 +16693,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; \
-@@ -1470,7 +1473,7 @@
+@@ -1470,7 +1471,7 @@
  	rm -f libkiocore_la.all_cpp.final libkiocore_la.all_cpp.files
  
  #>+ 11
@@ -15055,7 +16702,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; \
-@@ -1606,8 +1609,8 @@
+@@ -1606,8 +1607,8 @@
  forwardingslavebase.lo: forwardingslavebase.moc 
  metainfojob.o: metainfojob.moc 
  kurlcompletion.o: kurlcompletion.moc 
@@ -15066,9 +16713,24 @@
  dataslave.lo: dataslave.moc 
  $(srcdir)/tcpslavebase.cpp: observer_stub.h uiserver_stub.h 
 diff -Nru kdelibs-3.4.2.orig/kio/kioexec/Makefile.in kdelibs-3.4.2/kio/kioexec/Makefile.in
---- kdelibs-3.4.2.orig/kio/kioexec/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/kioexec/Makefile.in	2005-07-26 18:49:55.000000000 +0000
-@@ -254,6 +254,9 @@
+--- kdelibs-3.4.2.orig/kio/kioexec/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/kioexec/Makefile.in	2005-08-16 10:58:46.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(kioexec_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15078,7 +16740,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -499,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15087,7 +16749,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15100,9 +16762,24 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/kpasswdserver/Makefile.in kdelibs-3.4.2/kio/kpasswdserver/Makefile.in
---- kdelibs-3.4.2.orig/kio/kpasswdserver/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/kpasswdserver/Makefile.in	2005-07-26 18:49:55.000000000 +0000
-@@ -264,6 +264,9 @@
+--- kdelibs-3.4.2.orig/kio/kpasswdserver/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/kpasswdserver/Makefile.in	2005-08-16 10:58:46.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ # $Id: Makefile.am 261038 2003-10-22 13:01:55Z dfaure $
+ # Makefile.am of kdebase/kioslave/http
+ 
+-SOURCES = $(kded_kpasswdserver_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15112,7 +16789,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15121,7 +16798,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15134,8 +16811,14 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/kssl/kssl/caroot/Makefile.in kdelibs-3.4.2/kio/kssl/kssl/caroot/Makefile.in
---- kdelibs-3.4.2.orig/kio/kssl/kssl/caroot/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/kssl/kssl/caroot/Makefile.in	2005-07-26 18:49:55.000000000 +0000
+--- kdelibs-3.4.2.orig/kio/kssl/kssl/caroot/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/kssl/kssl/caroot/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15168,8 +16851,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kio/kssl/kssl/Makefile.in kdelibs-3.4.2/kio/kssl/kssl/Makefile.in
---- kdelibs-3.4.2.orig/kio/kssl/kssl/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/kssl/kssl/Makefile.in	2005-07-26 18:49:55.000000000 +0000
+--- kdelibs-3.4.2.orig/kio/kssl/kssl/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/kssl/kssl/Makefile.in	2005-08-16 10:58:46.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -241,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15202,9 +16891,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kio/kssl/Makefile.in kdelibs-3.4.2/kio/kssl/Makefile.in
---- kdelibs-3.4.2.orig/kio/kssl/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/kssl/Makefile.in	2005-07-26 18:49:55.000000000 +0000
-@@ -289,6 +289,9 @@
+--- kdelibs-3.4.2.orig/kio/kssl/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/kssl/Makefile.in	2005-08-16 10:58:46.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkssl_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15214,7 +16918,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -622,7 +625,7 @@
+@@ -622,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -15223,7 +16927,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +663,9 @@
+@@ -660,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15235,7 +16939,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  ksslconfig.h: stamp-h4
-@@ -674,7 +677,7 @@
+@@ -674,7 +675,7 @@
  stamp-h4: $(srcdir)/ksslconfig.h.in $(top_builddir)/config.status
  	@rm -f stamp-h4
  	cd $(top_builddir) && $(SHELL) ./config.status kio/kssl/ksslconfig.h
@@ -15245,9 +16949,24 @@
  	rm -f stamp-h4
  	touch $@
 diff -Nru kdelibs-3.4.2.orig/kio/Makefile.in kdelibs-3.4.2/kio/Makefile.in
---- kdelibs-3.4.2.orig/kio/Makefile.in	2005-07-20 21:20:14.000000000 +0000
-+++ kdelibs-3.4.2/kio/Makefile.in	2005-07-26 18:49:52.000000000 +0000
-@@ -308,6 +308,9 @@
+--- kdelibs-3.4.2.orig/kio/Makefile.in	2005-07-20 17:20:14.000000000 -0400
++++ kdelibs-3.4.2/kio/Makefile.in	2005-08-16 10:58:44.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkio_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -308,6 +306,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15257,7 +16976,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -581,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15266,7 +16985,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15279,9 +16998,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/misc/kdesasl/Makefile.in kdelibs-3.4.2/kio/misc/kdesasl/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kdesasl/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/misc/kdesasl/Makefile.in	2005-07-26 18:49:55.000000000 +0000
-@@ -261,6 +261,9 @@
+--- kdelibs-3.4.2.orig/kio/misc/kdesasl/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/misc/kdesasl/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkdesasl_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15291,7 +17025,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -510,7 +511,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15300,7 +17034,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -548,9 +549,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15313,9 +17047,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/misc/kfile/Makefile.in kdelibs-3.4.2/kio/misc/kfile/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kfile/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/misc/kfile/Makefile.in	2005-07-26 18:49:55.000000000 +0000
-@@ -254,6 +254,9 @@
+--- kdelibs-3.4.2.orig/kio/misc/kfile/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/misc/kfile/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(kfile_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -254,6 +252,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15325,7 +17074,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -499,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15334,7 +17083,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15347,9 +17096,24 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/misc/kntlm/Makefile.in kdelibs-3.4.2/kio/misc/kntlm/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kntlm/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/misc/kntlm/Makefile.in	2005-07-26 18:49:55.000000000 +0000
-@@ -263,6 +263,9 @@
+--- kdelibs-3.4.2.orig/kio/misc/kntlm/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/misc/kntlm/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkntlm_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15359,7 +17123,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -512,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15368,7 +17132,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15381,9 +17145,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/misc/kpac/Makefile.in kdelibs-3.4.2/kio/misc/kpac/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kpac/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/misc/kpac/Makefile.in	2005-07-26 18:49:55.000000000 +0000
-@@ -288,6 +288,9 @@
+--- kdelibs-3.4.2.orig/kio/misc/kpac/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/misc/kpac/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ 
+ 
+ 
+-SOURCES = $(kded_proxyscout_la_SOURCES) $(kpac_dhcp_helper_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15393,7 +17172,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -548,7 +551,7 @@
+@@ -548,7 +549,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -15402,7 +17181,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -586,9 +589,9 @@
+@@ -586,9 +587,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15415,9 +17194,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/misc/ksendbugmail/Makefile.in kdelibs-3.4.2/kio/misc/ksendbugmail/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/ksendbugmail/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/misc/ksendbugmail/Makefile.in	2005-07-26 18:49:56.000000000 +0000
-@@ -271,6 +271,9 @@
+--- kdelibs-3.4.2.orig/kio/misc/ksendbugmail/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/misc/ksendbugmail/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -33,8 +33,6 @@
+ #    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ #    Boston, MA 02111-1307, USA.
+ 
+-SOURCES = $(ksendbugmail_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15427,7 +17221,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +518,7 @@
+@@ -515,7 +516,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15436,7 +17230,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +556,9 @@
+@@ -553,9 +554,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15449,9 +17243,24 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/misc/kssld/Makefile.in kdelibs-3.4.2/kio/misc/kssld/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kssld/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/misc/kssld/Makefile.in	2005-07-26 18:49:56.000000000 +0000
-@@ -284,6 +284,9 @@
+--- kdelibs-3.4.2.orig/kio/misc/kssld/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/misc/kssld/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ 
+ 
+ 
+-SOURCES = $(kded_kssld_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15461,7 +17270,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -534,7 +535,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15470,7 +17279,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -572,9 +573,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15483,9 +17292,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/misc/kwalletd/Makefile.in kdelibs-3.4.2/kio/misc/kwalletd/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/kwalletd/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/misc/kwalletd/Makefile.in	2005-07-26 18:49:56.000000000 +0000
-@@ -286,6 +286,9 @@
+--- kdelibs-3.4.2.orig/kio/misc/kwalletd/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/misc/kwalletd/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ 
+ 
+ 
+-SOURCES = $(kded_kwalletd_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15495,7 +17319,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +539,7 @@
+@@ -536,7 +537,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15504,7 +17328,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +577,9 @@
+@@ -574,9 +575,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15517,9 +17341,39 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/misc/Makefile.in kdelibs-3.4.2/kio/misc/Makefile.in
---- kdelibs-3.4.2.orig/kio/misc/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/misc/Makefile.in	2005-07-26 18:49:55.000000000 +0000
-@@ -331,6 +331,9 @@
+--- kdelibs-3.4.2.orig/kio/misc/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/misc/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -37,10 +37,6 @@
+ 
+ 
+ 
+-#>- 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@
+@@ -140,8 +136,11 @@
+ #>+ 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)
++#>+ 2
+ SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
+-	$(ktelnetservice_SOURCES)
++	$(ktelnetservice_SOURCES) $(kio_uiserver_SOURCES) 
+ #>- DIST_SOURCES = $(kio_uiserver_la_SOURCES) $(kmailservice_SOURCES) \
+ #>- 	$(ktelnetservice_SOURCES)
+ #>+ 2
+@@ -331,6 +330,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15529,7 +17383,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -601,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15538,7 +17392,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15551,8 +17405,14 @@
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kio/pics/Makefile.in kdelibs-3.4.2/kio/pics/Makefile.in
---- kdelibs-3.4.2.orig/kio/pics/Makefile.in	2005-07-20 21:20:17.000000000 +0000
-+++ kdelibs-3.4.2/kio/pics/Makefile.in	2005-07-26 18:49:56.000000000 +0000
+--- kdelibs-3.4.2.orig/kio/pics/Makefile.in	2005-07-20 17:20:17.000000000 -0400
++++ kdelibs-3.4.2/kio/pics/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -215,6 +215,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15585,9 +17445,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kio/tests/Makefile.in kdelibs-3.4.2/kio/tests/Makefile.in
---- kdelibs-3.4.2.orig/kio/tests/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kio/tests/Makefile.in	2005-07-26 18:49:56.000000000 +0000
-@@ -493,6 +493,9 @@
+--- kdelibs-3.4.2.orig/kio/tests/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kio/tests/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -33,8 +33,6 @@
+ #    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ #    Boston, MA 02111-1307, USA.
+ 
+-SOURCES = $(dataprotocoltest_SOURCES) $(getalltest_SOURCES) $(jobtest_SOURCES) $(kclipboardtest_SOURCES) $(kdcopcheck_SOURCES) $(kdefaultprogresstest_SOURCES) $(kdirlistertest_SOURCES) $(kdirwatchtest_SOURCES) $(kfiltertest_SOURCES) $(kionetrctest_SOURCES) $(kiopassdlgtest_SOURCES) $(kioslavetest_SOURCES) $(kmfitest_SOURCES) $(kmimefromext_SOURCES) $(kmimemagictest_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@
+@@ -493,6 +491,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15597,7 +17472,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -767,7 +770,7 @@
+@@ -767,7 +768,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15606,7 +17481,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -805,9 +808,9 @@
+@@ -805,9 +806,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15619,9 +17494,24 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kioslave/bzip2/Makefile.in kdelibs-3.4.2/kioslave/bzip2/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/bzip2/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kioslave/bzip2/Makefile.in	2005-07-26 18:49:56.000000000 +0000
-@@ -261,6 +261,9 @@
+--- kdelibs-3.4.2.orig/kioslave/bzip2/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kioslave/bzip2/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(kbzip2filter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15631,7 +17521,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,7 @@
+@@ -507,7 +508,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15640,7 +17530,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -545,9 +548,9 @@
+@@ -545,9 +546,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15653,9 +17543,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kioslave/file/Makefile.in kdelibs-3.4.2/kioslave/file/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/file/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kioslave/file/Makefile.in	2005-07-26 18:49:56.000000000 +0000
-@@ -264,6 +264,9 @@
+--- kdelibs-3.4.2.orig/kioslave/file/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kioslave/file/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kio_file_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15665,7 +17570,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -517,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -15674,7 +17579,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15687,9 +17592,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kioslave/ftp/Makefile.in kdelibs-3.4.2/kioslave/ftp/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/ftp/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kioslave/ftp/Makefile.in	2005-07-26 18:49:56.000000000 +0000
-@@ -263,6 +263,9 @@
+--- kdelibs-3.4.2.orig/kioslave/ftp/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kioslave/ftp/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kio_ftp_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15699,7 +17619,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -512,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -15708,7 +17628,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15721,9 +17641,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kioslave/gzip/Makefile.in kdelibs-3.4.2/kioslave/gzip/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/gzip/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kioslave/gzip/Makefile.in	2005-07-26 18:49:56.000000000 +0000
-@@ -261,6 +261,9 @@
+--- kdelibs-3.4.2.orig/kioslave/gzip/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kioslave/gzip/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(kgzipfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -261,6 +259,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15733,7 +17668,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -508,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15742,7 +17677,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -546,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15755,9 +17690,37 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kioslave/http/kcookiejar/Makefile.in kdelibs-3.4.2/kioslave/http/kcookiejar/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/http/kcookiejar/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kioslave/http/kcookiejar/Makefile.in	2005-07-26 18:49:57.000000000 +0000
-@@ -308,6 +308,9 @@
+--- kdelibs-3.4.2.orig/kioslave/http/kcookiejar/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kioslave/http/kcookiejar/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -19,10 +19,6 @@
+ 
+ 
+ 
+-#>- 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@
+@@ -121,7 +117,9 @@
+ #>+ 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)
++#>- SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
++#>+ 1
++SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES) 
+ #>- DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES) 
+@@ -308,6 +306,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15767,7 +17730,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -574,7 +577,7 @@
+@@ -574,7 +575,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15776,7 +17739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +615,9 @@
+@@ -612,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15788,7 +17751,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1152,18 +1155,18 @@
+@@ -1152,18 +1153,18 @@
  kcookiejar_DEPENDENCIES = libkdeinit_kcookiejar.la
  
  #>+ 3
@@ -15813,7 +17776,7 @@
  
  #>+ 5
  kcookieserver.kidl: $(srcdir)/kcookieserver.h $(DCOP_DEPENDENCIES)
-@@ -1173,7 +1176,7 @@
+@@ -1173,7 +1174,7 @@
  
  #>+ 3
  clean-metasources:
@@ -15822,7 +17785,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 
-@@ -1225,7 +1228,7 @@
+@@ -1225,7 +1226,7 @@
  
  
  #>+ 11
@@ -15831,7 +17794,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; \
-@@ -1282,5 +1285,5 @@
+@@ -1282,5 +1283,5 @@
  nmcheck-am: nmcheck
  kcookiewin.lo: kcookiewin.moc 
  kcookieserver.lo: kcookieserver.moc 
@@ -15839,9 +17802,24 @@
  kcookieserver.o: kcookieserver.moc 
 +kcookiewin.o: kcookiewin.moc 
 diff -Nru kdelibs-3.4.2.orig/kioslave/http/kcookiejar/tests/Makefile.in kdelibs-3.4.2/kioslave/http/kcookiejar/tests/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/http/kcookiejar/tests/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kioslave/http/kcookiejar/tests/Makefile.in	2005-07-26 18:49:57.000000000 +0000
-@@ -250,6 +250,9 @@
+--- kdelibs-3.4.2.orig/kioslave/http/kcookiejar/tests/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kioslave/http/kcookiejar/tests/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ # $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@
+@@ -250,6 +248,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15851,7 +17829,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -493,7 +494,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15860,7 +17838,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -531,9 +532,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15873,9 +17851,37 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/kioslave/http/Makefile.in kdelibs-3.4.2/kioslave/http/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/http/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kioslave/http/Makefile.in	2005-07-26 18:49:57.000000000 +0000
-@@ -309,6 +309,9 @@
+--- kdelibs-3.4.2.orig/kioslave/http/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kioslave/http/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -21,10 +21,6 @@
+ 
+ 
+ 
+-#>- 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@
+@@ -121,7 +117,9 @@
+ #>+ 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)
++#>- 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) 
+ #>- DIST_SOURCES = $(kio_http_la_SOURCES) \
+ #>- 	$(kio_http_cache_cleaner_la_SOURCES)
+ #>+ 2
+@@ -309,6 +307,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15885,7 +17891,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -570,7 +573,7 @@
+@@ -570,7 +571,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -15894,7 +17900,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -608,9 +611,9 @@
+@@ -608,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15907,8 +17913,14 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kioslave/Makefile.in kdelibs-3.4.2/kioslave/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kioslave/Makefile.in	2005-07-26 18:49:56.000000000 +0000
+--- kdelibs-3.4.2.orig/kioslave/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kioslave/Makefile.in	2005-08-16 10:58:47.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -249,6 +249,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -15941,9 +17953,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kioslave/metainfo/Makefile.in kdelibs-3.4.2/kioslave/metainfo/Makefile.in
---- kdelibs-3.4.2.orig/kioslave/metainfo/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kioslave/metainfo/Makefile.in	2005-07-26 18:49:57.000000000 +0000
-@@ -263,6 +263,9 @@
+--- kdelibs-3.4.2.orig/kioslave/metainfo/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kioslave/metainfo/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kio_metainfo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15953,7 +17980,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -512,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15962,7 +17989,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15975,9 +18002,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kjs/Makefile.in kdelibs-3.4.2/kjs/Makefile.in
---- kdelibs-3.4.2.orig/kjs/Makefile.in	2005-07-20 21:20:18.000000000 +0000
-+++ kdelibs-3.4.2/kjs/Makefile.in	2005-07-26 18:49:57.000000000 +0000
-@@ -310,6 +310,9 @@
+--- kdelibs-3.4.2.orig/kjs/Makefile.in	2005-07-20 17:20:18.000000000 -0400
++++ kdelibs-3.4.2/kjs/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -34,8 +34,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(libkjs_la_SOURCES) $(testkjs_SOURCES) $(testkjs_static_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -310,6 +308,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15987,7 +18029,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -594,7 +595,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15996,7 +18038,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16009,9 +18051,24 @@
  global.h: $(top_builddir)/config.status $(srcdir)/global.h.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 diff -Nru kdelibs-3.4.2.orig/kmdi/kmdi/Makefile.in kdelibs-3.4.2/kmdi/kmdi/Makefile.in
---- kdelibs-3.4.2.orig/kmdi/kmdi/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kmdi/kmdi/Makefile.in	2005-07-26 18:49:59.000000000 +0000
-@@ -266,6 +266,9 @@
+--- kdelibs-3.4.2.orig/kmdi/kmdi/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kmdi/kmdi/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkmdi2_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -266,6 +264,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16021,7 +18078,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -513,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16030,7 +18087,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -551,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16042,7 +18099,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1011,18 +1014,18 @@
+@@ -1011,18 +1012,18 @@
  mocs: toolviewaccessor.moc
  
  #>+ 3
@@ -16067,7 +18124,7 @@
  
  #>+ 3
  guiclient.moc: $(srcdir)/guiclient.h
-@@ -1040,7 +1043,7 @@
+@@ -1040,7 +1041,7 @@
  
  #>+ 3
  clean-metasources:
@@ -16076,7 +18133,7 @@
  
  #>+ 2
  KDE_DIST=Makefile.in dockcontainer.h toolviewaccessor_p.h guiclient.h Makefile.am 
-@@ -1087,7 +1090,7 @@
+@@ -1087,7 +1088,7 @@
  
  
  #>+ 11
@@ -16085,7 +18142,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; \
-@@ -1128,14 +1131,14 @@
+@@ -1128,14 +1129,14 @@
  
  #>+ 13
  nmcheck: 
@@ -16103,9 +18160,24 @@
  toolviewaccessor.lo: toolviewaccessor.moc 
  dockcontainer.o: dockcontainer.moc 
 diff -Nru kdelibs-3.4.2.orig/kmdi/Makefile.in kdelibs-3.4.2/kmdi/Makefile.in
---- kdelibs-3.4.2.orig/kmdi/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kmdi/Makefile.in	2005-07-26 18:49:59.000000000 +0000
-@@ -284,6 +284,9 @@
+--- kdelibs-3.4.2.orig/kmdi/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kmdi/Makefile.in	2005-08-16 10:58:48.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkmdi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16115,7 +18187,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -538,7 +539,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16124,7 +18196,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -576,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16136,7 +18208,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1160,18 +1163,18 @@
+@@ -1160,18 +1161,18 @@
  mocs: kmdichildfrm.moc
  
  #>+ 3
@@ -16161,7 +18233,7 @@
  
  #>+ 3
  kmdifocuslist.moc: $(srcdir)/kmdifocuslist.h
-@@ -1217,7 +1220,7 @@
+@@ -1217,7 +1218,7 @@
  
  #>+ 3
  clean-metasources:
@@ -16170,7 +18242,7 @@
  
  #>+ 2
  KDE_DIST=kmdiguiclient.h Makefile.in kmdidockcontainer.h kmdidocumentviewtabwidget.h kmdifocuslist.h Makefile.am kmditoolviewaccessor_p.h 
-@@ -1264,7 +1267,7 @@
+@@ -1264,7 +1265,7 @@
  
  
  #>+ 11
@@ -16180,9 +18252,24 @@
  	rm -f libkmdi_la.all_cpp.files libkmdi_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkmdi_la.all_cpp.final; \
 diff -Nru kdelibs-3.4.2.orig/kmdi/test/Makefile.in kdelibs-3.4.2/kmdi/test/Makefile.in
---- kdelibs-3.4.2.orig/kmdi/test/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kmdi/test/Makefile.in	2005-07-26 18:49:59.000000000 +0000
-@@ -251,6 +251,9 @@
+--- kdelibs-3.4.2.orig/kmdi/test/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kmdi/test/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-SOURCES = $(kfourchildren_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16192,7 +18279,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -495,7 +498,7 @@
+@@ -495,7 +496,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16201,7 +18288,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -533,9 +536,9 @@
+@@ -533,9 +534,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16214,9 +18301,24 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/knewstuff/Makefile.in kdelibs-3.4.2/knewstuff/Makefile.in
---- kdelibs-3.4.2.orig/knewstuff/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/knewstuff/Makefile.in	2005-07-26 18:49:59.000000000 +0000
-@@ -298,6 +298,9 @@
+--- kdelibs-3.4.2.orig/knewstuff/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/knewstuff/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -18,8 +18,6 @@
+ 
+ 
+ 
+-SOURCES = $(libknewstuff_la_SOURCES) $(ghns_SOURCES) $(khotnewstuff_SOURCES) $(testnewstuff_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16226,7 +18328,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -562,7 +563,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16235,7 +18337,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -600,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16247,7 +18349,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1227,17 +1230,17 @@
+@@ -1227,17 +1228,17 @@
  
  #>+ 13
  install-kde-icons:
@@ -16269,9 +18371,24 @@
  #>+ 15
  force-reedit:
 diff -Nru kdelibs-3.4.2.orig/kparts/Makefile.in kdelibs-3.4.2/kparts/Makefile.in
---- kdelibs-3.4.2.orig/kparts/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kparts/Makefile.in	2005-07-26 18:49:59.000000000 +0000
-@@ -275,6 +275,9 @@
+--- kdelibs-3.4.2.orig/kparts/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kparts/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -19,8 +19,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkparts_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -275,6 +273,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16281,7 +18398,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -538,7 +539,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16290,7 +18407,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -576,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16302,7 +18419,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1072,13 +1075,6 @@
+@@ -1072,13 +1073,6 @@
  
  
  #>+ 3
@@ -16316,7 +18433,7 @@
  plugin.moc: $(srcdir)/plugin.h
  	$(MOC) $(srcdir)/plugin.h -o plugin.moc
  
-@@ -1093,6 +1089,13 @@
+@@ -1093,6 +1087,13 @@
  mocs: dockmainwindow.moc
  
  #>+ 3
@@ -16330,7 +18447,7 @@
  historyprovider.moc: $(srcdir)/historyprovider.h
  	$(MOC) $(srcdir)/historyprovider.h -o historyprovider.moc
  
-@@ -1150,7 +1153,7 @@
+@@ -1150,7 +1151,7 @@
  
  #>+ 3
  clean-metasources:
@@ -16339,7 +18456,7 @@
  
  #>+ 2
  KDE_DIST=krop.desktop Makefile.in COMMENTS design.h krwp.desktop kpart.desktop browserview.desktop Makefile.am 
-@@ -1201,7 +1204,7 @@
+@@ -1201,7 +1202,7 @@
  
  
  #>+ 11
@@ -16349,9 +18466,24 @@
  	rm -f libkparts_la.all_cpp.files libkparts_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkparts_la.all_cpp.final; \
 diff -Nru kdelibs-3.4.2.orig/kparts/tests/Makefile.in kdelibs-3.4.2/kparts/tests/Makefile.in
---- kdelibs-3.4.2.orig/kparts/tests/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kparts/tests/Makefile.in	2005-07-26 18:49:59.000000000 +0000
-@@ -304,6 +304,9 @@
+--- kdelibs-3.4.2.orig/kparts/tests/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kparts/tests/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @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@
+@@ -304,6 +302,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16361,7 +18493,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -575,7 +576,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16370,7 +18502,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -613,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16382,7 +18514,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1017,6 +1020,13 @@
+@@ -1017,6 +1018,13 @@
  mocs: ghostview.moc
  
  #>+ 3
@@ -16396,7 +18528,7 @@
  normalktm.moc: $(srcdir)/normalktm.h
  	$(MOC) $(srcdir)/normalktm.h -o normalktm.moc
  
-@@ -1031,13 +1041,6 @@
+@@ -1031,13 +1039,6 @@
  mocs: example.moc
  
  #>+ 3
@@ -16410,7 +18542,7 @@
  parts.moc: $(srcdir)/parts.h
  	$(MOC) $(srcdir)/parts.h -o parts.moc
  
-@@ -1071,7 +1074,7 @@
+@@ -1071,7 +1072,7 @@
  
  #>+ 3
  clean-metasources:
@@ -16420,9 +18552,24 @@
  #>+ 2
  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 
 diff -Nru kdelibs-3.4.2.orig/kresources/Makefile.in kdelibs-3.4.2/kresources/Makefile.in
---- kdelibs-3.4.2.orig/kresources/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kresources/Makefile.in	2005-07-26 18:49:59.000000000 +0000
-@@ -286,6 +286,9 @@
+--- kdelibs-3.4.2.orig/kresources/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kresources/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(kcm_kresources_la_SOURCES) $(libkresources_la_SOURCES) $(testresources_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16432,7 +18579,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -575,7 +576,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16441,7 +18588,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -613,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16453,7 +18600,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1174,18 +1177,18 @@
+@@ -1174,18 +1175,18 @@
  
  
  #>+ 3
@@ -16478,7 +18625,7 @@
  
  #>+ 3
  configdialog.moc: $(srcdir)/configdialog.h
-@@ -1227,7 +1230,7 @@
+@@ -1227,7 +1228,7 @@
  
  #>+ 3
  clean-metasources:
@@ -16488,9 +18635,24 @@
  #>+ 2
  KDE_DIST=kcmkresources.h Makefile.in kresources.desktop kresources_manager.desktop README.design kresources_plugin.desktop Makefile.am 
 diff -Nru kdelibs-3.4.2.orig/kspell2/Makefile.in kdelibs-3.4.2/kspell2/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kspell2/Makefile.in	2005-07-26 18:49:59.000000000 +0000
-@@ -285,6 +285,9 @@
+--- kdelibs-3.4.2.orig/kspell2/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kspell2/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkspell2base_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16500,7 +18662,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -544,7 +547,7 @@
+@@ -544,7 +545,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16509,7 +18671,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +585,9 @@
+@@ -582,9 +583,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16522,9 +18684,24 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/kspell2/plugins/aspell/Makefile.in kdelibs-3.4.2/kspell2/plugins/aspell/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/plugins/aspell/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kspell2/plugins/aspell/Makefile.in	2005-07-26 18:50:00.000000000 +0000
-@@ -264,6 +264,9 @@
+--- kdelibs-3.4.2.orig/kspell2/plugins/aspell/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kspell2/plugins/aspell/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(kspell_aspell_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -264,6 +262,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16534,7 +18711,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -517,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16543,7 +18720,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16556,9 +18733,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kspell2/plugins/ispell/Makefile.in kdelibs-3.4.2/kspell2/plugins/ispell/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/plugins/ispell/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kspell2/plugins/ispell/Makefile.in	2005-07-26 18:50:00.000000000 +0000
-@@ -266,6 +266,9 @@
+--- kdelibs-3.4.2.orig/kspell2/plugins/ispell/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kspell2/plugins/ispell/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(kspell_ispell_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -266,6 +264,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16568,7 +18760,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -527,7 +530,7 @@
+@@ -527,7 +528,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16577,7 +18769,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -565,9 +568,9 @@
+@@ -565,9 +566,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16590,8 +18782,14 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kspell2/plugins/Makefile.in kdelibs-3.4.2/kspell2/plugins/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/plugins/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kspell2/plugins/Makefile.in	2005-07-26 18:49:59.000000000 +0000
+--- kdelibs-3.4.2.orig/kspell2/plugins/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kspell2/plugins/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -16624,9 +18822,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kspell2/tests/Makefile.in kdelibs-3.4.2/kspell2/tests/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/tests/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kspell2/tests/Makefile.in	2005-07-26 18:50:00.000000000 +0000
-@@ -281,6 +281,9 @@
+--- kdelibs-3.4.2.orig/kspell2/tests/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kspell2/tests/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -14,8 +14,6 @@
+ # 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@
+@@ -281,6 +279,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16636,7 +18849,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +537,7 @@
+@@ -534,7 +535,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16645,7 +18858,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +575,9 @@
+@@ -572,9 +573,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16658,9 +18871,24 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/kspell2/ui/Makefile.in kdelibs-3.4.2/kspell2/ui/Makefile.in
---- kdelibs-3.4.2.orig/kspell2/ui/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kspell2/ui/Makefile.in	2005-07-26 18:50:00.000000000 +0000
-@@ -271,6 +271,9 @@
+--- kdelibs-3.4.2.orig/kspell2/ui/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kspell2/ui/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkspell2_la_SOURCES) $(libkspell2_noinst_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16670,7 +18898,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -531,7 +534,7 @@
+@@ -531,7 +532,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16679,7 +18907,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -569,9 +572,9 @@
+@@ -569,9 +570,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16692,9 +18920,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kstyles/highcolor/Makefile.in kdelibs-3.4.2/kstyles/highcolor/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/highcolor/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/highcolor/Makefile.in	2005-07-26 18:50:00.000000000 +0000
-@@ -277,6 +277,9 @@
+--- kdelibs-3.4.2.orig/kstyles/highcolor/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kstyles/highcolor/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(highcolor_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -277,6 +275,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16704,7 +18947,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -524,7 +525,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16713,7 +18956,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -562,9 +563,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16726,9 +18969,24 @@
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kstyles/highcontrast/Makefile.in kdelibs-3.4.2/kstyles/highcontrast/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/highcontrast/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/highcontrast/Makefile.in	2005-07-26 18:50:00.000000000 +0000
-@@ -280,6 +280,9 @@
+--- kdelibs-3.4.2.orig/kstyles/highcontrast/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kstyles/highcontrast/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ 
+ 
+ 
+-SOURCES = $(highcontrast_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16738,7 +18996,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -532,7 +533,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16747,7 +19005,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -570,9 +571,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16760,9 +19018,24 @@
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kstyles/keramik/Makefile.in kdelibs-3.4.2/kstyles/keramik/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/keramik/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/keramik/Makefile.in	2005-07-26 18:50:00.000000000 +0000
-@@ -271,6 +271,9 @@
+--- kdelibs-3.4.2.orig/kstyles/keramik/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/keramik/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(keramik_la_SOURCES) $(genembed_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16772,7 +19045,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +527,7 @@
+@@ -524,7 +525,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16781,7 +19054,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +565,9 @@
+@@ -562,9 +563,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16794,9 +19067,24 @@
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kstyles/klegacy/Makefile.in kdelibs-3.4.2/kstyles/klegacy/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/klegacy/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/klegacy/Makefile.in	2005-07-26 18:50:00.000000000 +0000
-@@ -262,6 +262,9 @@
+--- kdelibs-3.4.2.orig/kstyles/klegacy/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/klegacy/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(klegacystyle_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -262,6 +260,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16806,7 +19094,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,7 +513,7 @@
+@@ -510,7 +511,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16815,7 +19103,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -548,9 +551,9 @@
+@@ -548,9 +549,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16828,9 +19116,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kstyles/kthemestyle/Makefile.in kdelibs-3.4.2/kstyles/kthemestyle/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/kthemestyle/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/kthemestyle/Makefile.in	2005-07-26 18:50:00.000000000 +0000
-@@ -281,6 +281,9 @@
+--- kdelibs-3.4.2.orig/kstyles/kthemestyle/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/kthemestyle/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(kthemestyle_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16840,7 +19143,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -528,7 +529,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16849,7 +19152,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -566,9 +567,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16862,9 +19165,24 @@
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kstyles/light/Makefile.in kdelibs-3.4.2/kstyles/light/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/light/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/light/Makefile.in	2005-07-26 18:50:01.000000000 +0000
-@@ -281,6 +281,9 @@
+--- kdelibs-3.4.2.orig/kstyles/light/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/light/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -35,8 +35,6 @@
+ #    Boston, MA 02111-1307, USA.
+ 
+ 
+-SOURCES = $(light_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16874,7 +19192,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -528,7 +531,7 @@
+@@ -528,7 +529,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16883,7 +19201,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +569,9 @@
+@@ -566,9 +567,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16896,8 +19214,14 @@
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kstyles/Makefile.in kdelibs-3.4.2/kstyles/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/Makefile.in	2005-07-20 21:20:19.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/Makefile.in	2005-07-26 18:50:00.000000000 +0000
+--- kdelibs-3.4.2.orig/kstyles/Makefile.in	2005-07-20 17:20:19.000000000 -0400
++++ kdelibs-3.4.2/kstyles/Makefile.in	2005-08-16 10:58:49.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -16930,9 +19254,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kstyles/plastik/config/Makefile.in kdelibs-3.4.2/kstyles/plastik/config/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/plastik/config/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/plastik/config/Makefile.in	2005-07-26 18:50:01.000000000 +0000
-@@ -260,6 +260,9 @@
+--- kdelibs-3.4.2.orig/kstyles/plastik/config/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/plastik/config/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(kstyle_plastik_config_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -260,6 +258,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16942,7 +19281,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -506,7 +507,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16951,7 +19290,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -544,9 +545,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16964,9 +19303,24 @@
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kstyles/plastik/Makefile.in kdelibs-3.4.2/kstyles/plastik/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/plastik/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/plastik/Makefile.in	2005-07-26 18:50:01.000000000 +0000
-@@ -279,6 +279,9 @@
+--- kdelibs-3.4.2.orig/kstyles/plastik/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/plastik/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(plastik_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16976,7 +19330,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -532,7 +533,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16985,7 +19339,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -570,9 +571,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16998,8 +19352,14 @@
  install-kde_styleLTLIBRARIES: $(kde_style_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kstyles/riscos/Makefile.in kdelibs-3.4.2/kstyles/riscos/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/riscos/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/riscos/Makefile.in	2005-07-26 18:50:01.000000000 +0000
+--- kdelibs-3.4.2.orig/kstyles/riscos/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/riscos/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -226,6 +226,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17041,8 +19401,14 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/kstyles/themes/Makefile.in kdelibs-3.4.2/kstyles/themes/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/themes/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/themes/Makefile.in	2005-07-26 18:50:01.000000000 +0000
+--- kdelibs-3.4.2.orig/kstyles/themes/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/themes/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -227,6 +227,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17075,9 +19441,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kstyles/utils/installtheme/Makefile.in kdelibs-3.4.2/kstyles/utils/installtheme/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/utils/installtheme/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/utils/installtheme/Makefile.in	2005-07-26 18:50:01.000000000 +0000
-@@ -251,6 +251,9 @@
+--- kdelibs-3.4.2.orig/kstyles/utils/installtheme/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/utils/installtheme/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(kinstalltheme_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17087,7 +19468,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +506,7 @@
+@@ -503,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17096,7 +19477,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +544,9 @@
+@@ -541,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17109,8 +19490,14 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kstyles/utils/Makefile.in kdelibs-3.4.2/kstyles/utils/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/utils/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/utils/Makefile.in	2005-07-26 18:50:01.000000000 +0000
+--- kdelibs-3.4.2.orig/kstyles/utils/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/utils/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -231,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17143,9 +19530,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kstyles/web/Makefile.in kdelibs-3.4.2/kstyles/web/Makefile.in
---- kdelibs-3.4.2.orig/kstyles/web/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kstyles/web/Makefile.in	2005-07-26 18:50:01.000000000 +0000
-@@ -266,6 +266,9 @@
+--- kdelibs-3.4.2.orig/kstyles/web/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kstyles/web/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(webstyle_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -266,6 +264,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17155,7 +19557,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -516,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17164,7 +19566,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -554,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17177,9 +19579,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kutils/ksettings/Makefile.in kdelibs-3.4.2/kutils/ksettings/Makefile.in
---- kdelibs-3.4.2.orig/kutils/ksettings/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kutils/ksettings/Makefile.in	2005-07-26 18:50:01.000000000 +0000
-@@ -263,6 +263,9 @@
+--- kdelibs-3.4.2.orig/kutils/ksettings/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kutils/ksettings/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libksettings_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17189,7 +19606,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -508,7 +511,7 @@
+@@ -508,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17198,7 +19615,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -546,9 +549,9 @@
+@@ -546,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17211,9 +19628,24 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/kutils/Makefile.in kdelibs-3.4.2/kutils/Makefile.in
---- kdelibs-3.4.2.orig/kutils/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kutils/Makefile.in	2005-07-26 18:50:01.000000000 +0000
-@@ -289,6 +289,9 @@
+--- kdelibs-3.4.2.orig/kutils/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kutils/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -17,8 +17,6 @@
+ 
+ 
+ 
+-SOURCES = $(libkutils_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17223,7 +19655,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +564,7 @@
+@@ -561,7 +562,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17232,7 +19664,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +602,9 @@
+@@ -599,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17244,7 +19676,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1205,18 +1208,18 @@
+@@ -1205,18 +1206,18 @@
  
  
  #>+ 3
@@ -17269,7 +19701,7 @@
  
  #>+ 3
  kpluginselector.moc: $(srcdir)/kpluginselector.h
-@@ -1275,22 +1278,22 @@
+@@ -1275,22 +1276,22 @@
  mocs: kpluginselector_p.moc
  
  #>+ 3
@@ -17299,7 +19731,7 @@
  
  #>+ 2
  KDE_DIST=kdeglobals.kcfgc Makefile.in kdeglobals.kcfg kplugininfo.desktop Makefile.am 
-@@ -1346,7 +1349,7 @@
+@@ -1346,7 +1347,7 @@
  
  
  #>+ 11
@@ -17309,9 +19741,24 @@
  	rm -f libkutils_la.all_cpp.files libkutils_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkutils_la.all_cpp.final; \
 diff -Nru kdelibs-3.4.2.orig/kutils/tests/Makefile.in kdelibs-3.4.2/kutils/tests/Makefile.in
---- kdelibs-3.4.2.orig/kutils/tests/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kutils/tests/Makefile.in	2005-07-26 18:50:02.000000000 +0000
-@@ -251,6 +251,9 @@
+--- kdelibs-3.4.2.orig/kutils/tests/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kutils/tests/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-SOURCES = $(kfindtest_SOURCES) $(kreplacetest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -251,6 +249,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17321,7 +19768,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +502,7 @@
+@@ -499,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17330,7 +19777,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +540,9 @@
+@@ -537,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17343,9 +19790,24 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/kwallet/backend/Makefile.in kdelibs-3.4.2/kwallet/backend/Makefile.in
---- kdelibs-3.4.2.orig/kwallet/backend/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kwallet/backend/Makefile.in	2005-07-26 18:50:02.000000000 +0000
-@@ -265,6 +265,9 @@
+--- kdelibs-3.4.2.orig/kwallet/backend/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kwallet/backend/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkwalletbackend_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -265,6 +263,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17355,7 +19817,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -526,7 +529,7 @@
+@@ -526,7 +527,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -17364,7 +19826,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -564,9 +567,9 @@
+@@ -564,9 +565,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17377,9 +19839,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kwallet/backend/tests/Makefile.in kdelibs-3.4.2/kwallet/backend/tests/Makefile.in
---- kdelibs-3.4.2.orig/kwallet/backend/tests/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kwallet/backend/tests/Makefile.in	2005-07-26 18:50:02.000000000 +0000
-@@ -263,6 +263,9 @@
+--- kdelibs-3.4.2.orig/kwallet/backend/tests/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kwallet/backend/tests/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-SOURCES = $(backendtest_SOURCES) $(testbf_SOURCES) $(testsha_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17389,7 +19866,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -509,7 +512,7 @@
+@@ -509,7 +510,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17398,7 +19875,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -547,9 +550,9 @@
+@@ -547,9 +548,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17411,9 +19888,24 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/kwallet/client/Makefile.in kdelibs-3.4.2/kwallet/client/Makefile.in
---- kdelibs-3.4.2.orig/kwallet/client/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kwallet/client/Makefile.in	2005-07-26 18:50:02.000000000 +0000
-@@ -263,6 +263,9 @@
+--- kdelibs-3.4.2.orig/kwallet/client/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kwallet/client/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkwalletclient_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17423,7 +19915,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -516,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -17432,7 +19924,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -554,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17445,8 +19937,14 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/kwallet/Makefile.in kdelibs-3.4.2/kwallet/Makefile.in
---- kdelibs-3.4.2.orig/kwallet/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kwallet/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/kwallet/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kwallet/Makefile.in	2005-08-16 10:58:50.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -232,6 +232,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17479,9 +19977,24 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/kwallet/tests/Makefile.in kdelibs-3.4.2/kwallet/tests/Makefile.in
---- kdelibs-3.4.2.orig/kwallet/tests/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/kwallet/tests/Makefile.in	2005-07-26 18:50:02.000000000 +0000
-@@ -267,6 +267,9 @@
+--- kdelibs-3.4.2.orig/kwallet/tests/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/kwallet/tests/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -14,8 +14,6 @@
+ # PARTICULAR PURPOSE.
+ 
+ @SET_MAKE@
+-SOURCES = $(kwalletasync_SOURCES) $(kwalletboth_SOURCES) $(kwalletsync_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17491,7 +20004,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +520,7 @@
+@@ -517,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17500,7 +20013,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +558,9 @@
+@@ -555,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17513,9 +20026,24 @@
  
  clean-checkPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/libkmid/Makefile.in kdelibs-3.4.2/libkmid/Makefile.in
---- kdelibs-3.4.2.orig/libkmid/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/libkmid/Makefile.in	2005-07-26 18:50:02.000000000 +0000
-@@ -271,6 +271,9 @@
+--- kdelibs-3.4.2.orig/libkmid/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/libkmid/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkmid_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17525,7 +20053,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -532,7 +533,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -17534,7 +20062,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -570,9 +571,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17547,9 +20075,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/libkmid/tests/Makefile.in kdelibs-3.4.2/libkmid/tests/Makefile.in
---- kdelibs-3.4.2.orig/libkmid/tests/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/libkmid/tests/Makefile.in	2005-07-26 18:50:02.000000000 +0000
-@@ -266,6 +266,9 @@
+--- kdelibs-3.4.2.orig/libkmid/tests/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/libkmid/tests/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(apitest_SOURCES) $(ctest_SOURCES) $(notesoff_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -266,6 +264,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17559,7 +20102,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -512,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -17568,7 +20111,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -550,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17581,9 +20124,24 @@
  
  clean-noinstPROGRAMS:
 diff -Nru kdelibs-3.4.2.orig/libkscreensaver/Makefile.in kdelibs-3.4.2/libkscreensaver/Makefile.in
---- kdelibs-3.4.2.orig/libkscreensaver/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/libkscreensaver/Makefile.in	2005-07-26 18:50:02.000000000 +0000
-@@ -263,6 +263,9 @@
+--- kdelibs-3.4.2.orig/libkscreensaver/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/libkscreensaver/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libkscreensaver_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17593,7 +20151,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -509,7 +512,7 @@
+@@ -509,7 +510,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17602,7 +20160,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -547,9 +550,9 @@
+@@ -547,9 +548,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17615,9 +20173,24 @@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 diff -Nru kdelibs-3.4.2.orig/libltdl/Makefile.in kdelibs-3.4.2/libltdl/Makefile.in
---- kdelibs-3.4.2.orig/libltdl/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/libltdl/Makefile.in	2005-07-26 18:50:02.000000000 +0000
-@@ -241,6 +241,9 @@
+--- kdelibs-3.4.2.orig/libltdl/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/libltdl/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -16,8 +16,6 @@
+ @SET_MAKE@
+ 
+ 
+-SOURCES = $(libltdlc_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -241,6 +239,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17627,7 +20200,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -485,7 +488,7 @@
+@@ -485,7 +486,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -17636,7 +20209,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -523,9 +526,9 @@
+@@ -523,9 +524,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17649,8 +20222,14 @@
  
  clean-noinstLTLIBRARIES:
 diff -Nru kdelibs-3.4.2.orig/licenses/Makefile.in kdelibs-3.4.2/licenses/Makefile.in
---- kdelibs-3.4.2.orig/licenses/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/licenses/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/licenses/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/licenses/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17683,8 +20262,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/Makefile.in kdelibs-3.4.2/Makefile.in
---- kdelibs-3.4.2.orig/Makefile.in	2005-07-20 21:20:03.000000000 +0000
-+++ kdelibs-3.4.2/Makefile.in	2005-07-26 18:49:31.000000000 +0000
+--- kdelibs-3.4.2.orig/Makefile.in	2005-07-20 17:20:03.000000000 -0400
++++ kdelibs-3.4.2/Makefile.in	2005-08-16 10:58:18.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -277,6 +277,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17738,8 +20323,14 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/application/Makefile.in kdelibs-3.4.2/mimetypes/application/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/application/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/application/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/application/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/application/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17781,8 +20372,14 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/audio/Makefile.in kdelibs-3.4.2/mimetypes/audio/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/audio/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/audio/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/audio/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/audio/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17824,8 +20421,14 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/image/Makefile.in kdelibs-3.4.2/mimetypes/image/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/image/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/image/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/image/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/image/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17858,8 +20461,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/inode/Makefile.in kdelibs-3.4.2/mimetypes/inode/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/inode/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/inode/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/inode/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/inode/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17892,8 +20501,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/Makefile.in kdelibs-3.4.2/mimetypes/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -241,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17926,8 +20541,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/message/Makefile.in kdelibs-3.4.2/mimetypes/message/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/message/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/message/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/message/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/message/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17960,8 +20581,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/model/Makefile.in kdelibs-3.4.2/mimetypes/model/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/model/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/model/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/model/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/model/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -17994,8 +20621,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/multipart/Makefile.in kdelibs-3.4.2/mimetypes/multipart/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/multipart/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/multipart/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/multipart/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/multipart/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -18028,8 +20661,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/text/Makefile.in kdelibs-3.4.2/mimetypes/text/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/text/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/text/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/text/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/text/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -18071,8 +20710,14 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/uri/Makefile.in kdelibs-3.4.2/mimetypes/uri/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/uri/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/uri/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/uri/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/uri/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -18105,8 +20750,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/mimetypes/video/Makefile.in kdelibs-3.4.2/mimetypes/video/Makefile.in
---- kdelibs-3.4.2.orig/mimetypes/video/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/mimetypes/video/Makefile.in	2005-07-26 18:50:02.000000000 +0000
+--- kdelibs-3.4.2.orig/mimetypes/video/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/mimetypes/video/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -18139,8 +20790,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/pics/crystalsvg/kde/Makefile.in kdelibs-3.4.2/pics/crystalsvg/kde/Makefile.in
---- kdelibs-3.4.2.orig/pics/crystalsvg/kde/Makefile.in	2005-07-20 21:20:21.000000000 +0000
-+++ kdelibs-3.4.2/pics/crystalsvg/kde/Makefile.in	2005-07-26 18:50:04.000000000 +0000
+--- kdelibs-3.4.2.orig/pics/crystalsvg/kde/Makefile.in	2005-07-20 17:20:21.000000000 -0400
++++ kdelibs-3.4.2/pics/crystalsvg/kde/Makefile.in	2005-08-16 10:58:52.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -217,6 +217,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -18182,8 +20839,14 @@
  #>+ 2
  docs-am:
 diff -Nru kdelibs-3.4.2.orig/pics/crystalsvg/Makefile.in kdelibs-3.4.2/pics/crystalsvg/Makefile.in
---- kdelibs-3.4.2.orig/pics/crystalsvg/Makefile.in	2005-07-20 21:20:21.000000000 +0000
-+++ kdelibs-3.4.2/pics/crystalsvg/Makefile.in	2005-07-26 18:50:04.000000000 +0000
+--- kdelibs-3.4.2.orig/pics/crystalsvg/Makefile.in	2005-07-20 17:20:21.000000000 -0400
++++ kdelibs-3.4.2/pics/crystalsvg/Makefile.in	2005-08-16 10:58:52.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -241,6 +241,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -18215,17 +20878,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -853,3679 +856,3679 @@
+@@ -853,3679 +856,3681 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=cr32-device-system.png cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png crsc-filesys-folder_favorite.svgz cr32-mime-template_source.png cr16-action-about_kde.png crsc-mime-zip.svgz cr32-action-mail_post_to.png cr16-mime-tar.png cr64-filesys-lockoverlay.png cr16-filesys-lockoverlay.png cr16-device-hdd_mount.png cr64-mime-exec_wine.png cr64-mime-source_y.png cr48-device-cdrom_mount.png cr32-mime-exec_wine.png cr22-action-player_eject.png cr22-mime-tgz.png cr32-action-messagebox_critical.png crsc-device-zip_unmount.svgz cr32-action-text_block.png cr32-device-mo_unmount.png cr16-device-tv.png cr48-mime-info.png cr16-filesys-link.png cr32-action-player_eject.png cr64-mime-shellscript.png cr22-mime-soffice.png cr16-device-printer1.png cr22-action-math_brace.png cr32-filesys-file_broken.png crsc-mime-video.svgz cr22-action-window_new.png cr16-action-move.png cr128-mime-misc.png cr64-action-frameprint.png cr32-action-leftjust.png cr16-action-music_32ndnote.png cr16-action-2rightarrow.png cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr64-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png crsc-filesys-home_white.svgz cr16-action-editclear.png cr16-filesys-folder_important.png cr22-action-music_quarternote.png cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr64-device-smart_media_mount.png cr48-mime-source_o.png cr32-device-cdwriter_unmount.png crsc-filesys-folder_locked.svgz cr64-mime-cdr.png cr48-action-frameprint.png cr48-mime-encrypted.png cr32-mime-make.png crsc-mime-source.svgz cr128-filesys-folder_yellow.png cr22-action-thumbnail.png cr16-action-news_subscribe.png cr22-device-memory_stick_unmount.png cr48-action-share.png crsc-mime-cdtrack.svgz cr22-filesys-folder_grey.png cr32-filesys-desktop.png cr16-mime-postscript.png cr64-filesys-zip.png cr16-action-text.png cr32-mime-pdf.png cr22-mime-source_o.png cr48-filesys-link.png cr16-mime-news.png cr128-mime-source_h.png crsc-filesys-folder_green.svgz cr16-action-filefind.png crsc-action-fileprint.svgz cr22-action-mail_find.png cr32-action-next.png cr64-mime-video.png cr64-mime-gf.png cr16-action-save_all.png cr48-mime-txt.png cr128-mime-metafont.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr128-mime-source.png cr48-filesys-folder_violet.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png cr32-action-bookmark_folder.png cr22-mime-info.png cr22-action-mail_new3.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr128-mime-source_f.png cr16-mime-misc.png cr16-action-player_play.png cr22-action-mail_delete.png cr32-action-view_top_bottom.png cr22-action-button_cancel.png cr22-mime-kformula_kfo.png cr32-action-share.png cr32-mime-gf.png cr16-action-window_nofullscreen.png cr16-filesys-folder_html.png cr64-device-nfs_unmount.png cr16-action-player_end.png cr16-action-fileopen.png cr128-app-password.png cr48-mime-source_moc.png cr64-mime-source_php.png cr22-action-encrypted.png cr22-action-make_kdevelop.png cr48-device-tablet.png cr16-action-filesaveas.png cr48-device-mo_mount.png crsc-mime-source_o.svgz cr48-filesys-file_broken.png cr48-action-back.png cr32-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr64-device-cdaudio_mount.png cr48-action-filequickprint.png cr128-mime-pdf.png cr22-action-pencil.png cr16-action-text_center.png cr32-mime-tar.png cr64-mime-misc.png cr16-action-eraser.png cr128-mime-font.png crsc-device-hdd_unmount.svgz cr22-action-filenew.png cr16-action-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.png cr48-device-usbpendrive_mount.png cr32-action-music_fermatenote.png crsc-device-scanner.svgz cr16-action-flag.png cr22-action-rotate_ccw.png cr16-action-text_strike.png cr22-action-text_right.png cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr16-action-lock.png cr22-action-music_halfnote.png cr64-mime-dvi.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr22-action-view_choose.png cr16-action-remove.png cr22-action-translate.png cr64-mime-man.png cr32-action-down.png cr22-mime-source_j.png cr16-action-blend.png cr48-filesys-folder_print.png cr22-mime-image.png cr22-mime-krita_kra.png crsc-filesys-network_local.svgz cr48-mime-gettext.png cr32-action-bookmark.png crsc-filesys-folder_blue.svgz crsc-action-text_bild.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr48-filesys-folder_yellow.png cr22-action-project_open.png cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png crsc-mime-ascii.svgz cr48-device-sd_mmc_mount.png cr22-action-music_dottednote.png cr128-mime-readme.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png cr32-mime-txt2.png cr22-action-mail_reply.png crsc-mime-source_s.svgz cr32-device-usbpendrive_mount.png cr128-mime-resource.png cr16-mime-core.png cr16-filesys-folder_orange_open.png cr32-action-stop.png cr128-mime-pk.png cr16-mime-kword_kwd.png cr22-action-queue.png cr32-device-blockdevice.png cr48-mime-man.png cr16-action-viewmag+.png cr16-action-exit.png cr64-mime-source.png cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz cr32-device-nfs_mount.png cr16-action-revert.png cr22-mime-source_l.png cr22-action-view_left_right.png crsc-mime-pk.svgz cr32-action-exit.png cr22-action-up.png cr16-action-share.png cr16-mime-source_php.png cr32-mime-font_type1.png cr16-action-translate.png cr16-device-memory_stick_unmount.png cr64-mime-deb.png cr32-action-music_cross.png cr16-action-finish.png cr128-device-compact_flash_unmount.png cr64-mime-kmultiple.png cr16-action-text_left.png cr64-filesys-desktop.png cr16-mime-rpm.png cr16-action-reload.png cr64-mime-readme.png cr22-mime-rpm.png cr16-filesys-folder.png cr64-device-zip_mount.png cr32-mime-document.png cr32-mime-video.png cr128-filesys-folder_home2.png cr22-action-halfencrypted.png cr16-device-cdwriter_unmount.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr16-action-reload_page.png cr32-action-bookmarks_list_add.png cr128-mime-exec_wine.png cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png cr48-device-smart_media_mount.png crsc-action-text_super.svgz crsc-action-frameprint.svgz cr16-mime-kformula_kfo.png cr22-mime-source_py.png cr48-mime-source_c.png cr32-device-cdrom_unmount.png cr22-mime-dvi.png cr16-action-music_fermatenote.png cr16-action-emptytrash.png cr32-action-fonts.png cr16-action-fill.png cr64-mime-unknown.png cr22-action-viewmag1.png cr32-mime-kpresenter_kpr.png cr16-mime-metafont.png crsc-device-mouse.svgz cr128-action-filequickprint.png cr16-action-music_sixteenthnote.png cr22-mime-source_p.png crsc-action-text_bold.svg cr32-action-blend.png cr128-filesys-folder_red.png cr48-action-gear.png cr22-action-player_rew.png crsc-mime-vectorgfx.svgz cr64-app-password.png cr48-mime-ascii.png index.theme cr16-filesys-file_broken.png cr22-mime-kchart_chrt.png cr64-filesys-folder_important.png crsc-mime-shellscript.svgz crsc-filesys-folder_yellow_open.svgz cr22-filesys-folder_grey_open.png cr16-action-charset.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz cr22-action-player_fwd.png crsc-filesys-folder_violet_open.svgz cr16-action-edittrash.png cr16-device-memory_stick_mount.png cr16-action-rotate.png cr16-action-connect_no.png cr16-action-frame_query.png cr22-action-about_kde.png cr16-action-math_rsub.png cr48-action-unindent.png cr16-mime-info.png crsc-filesys-link.svgz cr48-action-fileclose.png cr128-mime-tex.png cr22-action-music_sixteenthnote.png cr22-mime-gf.png cr16-filesys-folder_home2.png crsc-filesys-folder_html.svgz cr22-filesys-folder_green_open.png cr32-mime-source.png cr32-action-math_paren.png cr32-mime-kugar_kud.png cr32-action-math_rsub.png cr128-mime-source_j.png cr128-filesys-exec.png cr128-mime-source_y.png cr48-device-dvd_unmount.png crsc-filesys-folder_txt.svgz cr16-mime-deb.png cr32-filesys-folder_green.png cr22-action-connect_established.png crsc-filesys-file_important.svgz crsc-filesys-folder_red_open.svgz cr22-action-frame_text.png cr16-action-back.png cr48-mime-karbon_karbon.png cr128-filesys-folder_txt.png crsc-mime-tgz.svgz cr32-mime-kspread_ksp.png crsc-mime-log.svgz cr22-action-decrypted.png cr16-action-viewmag1.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr16-mime-tgz.png cr16-filesys-network.png cr32-action-player_pause.png cr32-action-mail_generic.png cr22-action-view_icon.png cr16-filesys-www.png cr22-filesys-folder_yellow.png cr16-action-math_sum.png crsc-action-info.svgz cr48-filesys-desktop.png cr48-mime-tex.png cr32-action-rotate_cw.png cr16-action-editcopy.png cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.png cr64-mime-font_truetype.png crsc-mime-file_temporary.svgz cr22-mime-readme.png cr48-mime-source_cpp.png cr32-action-gohome.png cr16-mime-source_py.png cr22-action-view_top_bottom.png cr22-mime-cdimage.png cr16-mime-cdimage.png cr64-filesys-folder_home2.png cr16-action-previous.png cr16-device-cdwriter_mount.png cr32-device-scanner.png cr32-mime-kexi_kexi.png cr22-action-top.png cr16-action-view_icon.png cr32-action-emptytrash.png cr22-action-signature.png cr16-device-mo_unmount.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-filesys-zip.png cr32-action-filesaveas.png cr32-mime-gettext.png cr32-action-player_play.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr16-action-color_fill.png cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.png cr128-mime-txt.png cr64-mime-recycled.png crsc-device-usbpendrive_mount.svgz cr32-filesys-trashcan_full.png cr32-action-player_playlist.png cr22-mime-spreadsheet.png cr22-action-music_32ndnote.png cr48-filesys-folder_html.png cr22-action-centrejust.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr16-action-rotate_cw.png cr64-mime-pk.png crsc-device-memory.svgz cr16-filesys-folder_favorite.png cr22-action-reload_page.png cr22-action-window_fullscreen.png cr16-action-configure.png cr128-mime-vcalendar.png cr32-action-contexthelp.png cr22-action-configure.png cr16-action-math_brace.png cr22-mime-vcalendar.png cr16-filesys-folder_image.png crsc-mime-source_f.svgz cr22-device-memory_stick_mount.png cr128-mime-encrypted.png cr32-action-viewmag1.png cr16-action-view_sidetree.png crsc-action-filequickprint.svgz cr32-mime-spreadsheet.png cr16-device-chardevice.png cr16-mime-source_c.png cr32-action-viewmag-.png cr128-mime-cdtrack.png cr16-mime-kchart_chrt.png cr16-mime-txt2.png cr16-mime-binary.png crsc-filesys-folder_red.svgz cr64-mime-cdimage.png cr22-action-leftjust.png crsc-filesys-exec.svgz cr32-action-window_fullscreen.png cr48-mime-source_l.png cr16-filesys-folder_violet_open.png cr32-action-mail_new.png cr48-device-sd_mmc_unmount.png cr128-filesys-folder_orange.png cr64-device-cdwriter_mount.png cr48-mime-midi.png cr48-mime-font.png cr32-mime-kformula_kfo.png cr64-device-system.png cr16-mime-font.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr22-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.png cr32-action-text_right.png cr32-action-music_cleficon.png cr16-action-reload_all_tabs.png cr48-device-usbpendrive_unmount.png cr64-filesys-folder_green_open.png cr48-mime-image.png cr22-filesys-folder_red_open.png cr22-action-player_stop.png cr32-action-connect_creating.png cr64-mime-colorscm.png crsc-mime-koffice.svgz cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr48-action-identity.png cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr22-device-sd_mmc_unmount.png cr16-action-find.png cr16-action-math_prod.png cr32-action-mail_reply.png cr32-action-wizard.png cr64-device-mouse.png cr16-mime-source_h.png cr128-filesys-folder_tar.png cr22-action-run.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr32-action-mail_find.png cr128-filesys-network.png cr32-action-view_bottom.png crsc-device-compact_flash_unmount.svgz crsc-mime-message.svgz cr16-action-math_brackets.png cr48-filesys-folder_green_open.png cr22-mime-file_temporary.png cr48-action-bookmark.png cr22-action-move.png cr48-mime-soffice.png cr22-device-sd_mmc_mount.png cr16-action-no.png cr16-action-frame_edit.png cr16-action-filenew.png cr48-mime-video.png cr22-action-contexthelp.png cr16-action-make_kdevelop.png cr128-mime-postscript.png cr22-action-message_reply.png cr16-action-fork.png cr16-app-password.png cr22-mime-deb.png cr32-action-about_kde.png cr16-action-connect_creating.png crsc-action-about_kde.svgz cr16-action-window_new.png crsc-mime-man.svgz cr22-filesys-www.png cr32-action-text_strike.png cr22-device-printer1.png cr64-mime-kivio_flw.png cr128-mime-karbon_karbon.png cr48-filesys-folder_important.png cr48-filesys-exec.png cr48-filesys-network_local.png cr48-mime-kword_kwd.png cr32-action-math_prod.png cr16-action-attach.png cr128-mime-netscape_doc.png cr22-action-text_italic.png crsc-mime-kmultiple.svgz cr32-action-math_int.png cr128-mime-empty.png cr64-device-dvd_mount.png cr128-mime-recycled.png cr32-mime-cdr.png cr22-action-mail_new.png cr32-mime-krita_kra.png cr22-device-compact_flash_unmount.png cr128-device-memory_stick_mount.png cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_grey.png cr64-filesys-folder_orange_open.png cr48-mime-kexi_kexi.png cr32-action-player_stop.png cr32-filesys-www.png crsc-filesys-folder_blue_open.svgz cr48-device-nfs_mount.png cr16-action-mail_replylist.png cr32-action-math_onetwomatrix.png cr16-action-airbrush.png cr22-action-colorpicker.png cr48-device-joystick.png crsc-filesys-file_broken.svgz cr16-mime-source_y.png cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr22-action-math_abs.png cr32-device-camera_mount.png cr128-filesys-network_local.png cr32-action-make_kdevelop.png cr48-filesys-folder_tar.png cr16-mime-readme.png cr32-mime-source_s.png cr16-filesys-folder_video.png crsc-mime-make.svgz cr64-filesys-folder_txt.png cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.png crsc-mime-applix.svgz cr16-filesys-zip.png cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.png cr48-filesys-folder_green.png cr22-action-color_fill.png cr48-filesys-folder_violet_open.png cr32-filesys-folder_favorite.png cr22-action-math_frac.png cr64-filesys-folder_print.png cr32-mime-source_o.png cr16-action-music_fullnote.png cr128-filesys-folder_video.png cr32-action-fileimport.png cr22-mime-midi.png cr64-mime-core.png cr32-action-colorize.png cr22-action-filefind.png cr64-filesys-folder_locked.png cr32-action-view_tree.png cr64-device-hdd_mount.png cr128-action-share.png cr32-action-today.png cr64-filesys-folder_video.png cr32-mime-file_temporary.png svgz-action-text_italic.svgz cr32-filesys-folder_grey_open.png cr32-action-math_matrix.png cr48-device-scanner.png cr128-mime-dvi.png cr16-device-compact_flash_unmount.png cr64-filesys-exec.png cr128-device-hdd_unmount.png cr16-action-math_int.png cr32-device-dvd_unmount.png cr16-action-math_sqrt.png crsc-action-configure.svgz cr48-mime-source_f.png crsc-filesys-desktop.svgz cr128-mime-document2.png cr32-device-compact_flash_unmount.png cr32-action-indent.png cr16-action-bookmark.png crsc-mime-recycled.svgz cr32-device-cdwriter_mount.png cr32-mime-source_l.png cr48-mime-zip.png cr22-filesys-desktop.png cr48-device-cdwriter_unmount.png cr16-action-kde5.png cr32-action-top.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr16-action-contents.png cr128-filesys-folder_favorite.png cr16-action-frame_spreadsheet.png cr22-mime-koffice.png cr128-mime-template_source.png cr32-mime-dvi.png cr128-filesys-www.png cr22-action-reload3.png crsc-device-blockdevice.svgz cr22-action-goto.png crsc-mime-image.svgz cr16-action-math_abs.png cr22-device-compact_flash_mount.png cr32-device-5floppy_mount.png cr48-device-blockdevice.png cr48-mime-kmultiple.png cr16-action-tab_remove.png crsc-filesys-folder_man2.svgz cr48-mime-kugar_kud.png cr22-action-mouse.png cr22-mime-source_java.png crsc-mime-source_java.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr16-device-tablet.png cr48-mime-template_source.png cr32-action-player_end.png crsc-mime-source_p.svgz crsc-filesys-folder_orange_open.svgz cr32-action-text_left.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr32-mime-cdimage.png cr16-filesys-desktop.png cr22-mime-video.png cr22-device-system.png cr16-action-tab_new.png crsc-action-mail_post_to.svgz cr64-filesys-folder_orange.png cr64-filesys-folder_yellow.png cr32-action-finish.png cr32-mime-karbon_karbon.png cr16-action-1uparrow.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-filesys-folder_sound.svgz cr16-action-wizard.png cr128-filesys-file_broken.png cr16-action-math_rsup.png cr32-device-pda_black.png cr48-mime-source_pl.png cr32-action-viewmag.png crsc-mime-rpm.svgz crsc-device-cdwriter_unmount.svgz cr48-device-chardevice.png cr32-mime-vcard.png cr22-filesys-folder_print.png cr48-mime-source_s.png cr64-device-nfs_mount.png crsc-action-exit.svgz crsc-device-dvd_unmount.svgz cr64-mime-source_moc.png cr32-action-clear_left.png cr22-action-text_block.png cr48-mime-krita_kra.png cr48-device-mouse.png crsc-mime-source_l.svgz cr128-mime-source_s.png cr16-mime-source_java.png cr16-action-services.png crsc-mime-txt2.svgz cr22-action-mail_replylist.png cr64-device-mo_mount.png cr64-filesys-folder_html.png crsc-action-text_sub.svgz cr64-mime-source_h.png cr22-mime-source_s.png cr32-action-player_fwd.png cr48-mime-log.png cr64-filesys-network_local.png cr22-action-rebuild.png cr32-device-print_class.png cr48-action-lock.png cr32-action-edittrash.png cr22-action-unlock.png cr22-action-save_all.png cr16-device-print_class.png crsc-mime-source_c.svgz cr22-filesys-folder.png crsc-device-dvd_mount.svgz cr16-filesys-folder_inbox.png cr48-mime-cdtrack.png cr16-action-view_right.png cr16-action-frame_image.png cr64-device-camera_unmount.png cr32-filesys-folder.png crsc-device-mo_umount.svgz cr16-action-redo.png cr16-filesys-folder_outbox.png cr22-action-fill.png cr32-device-joystick.png cr16-action-cancel.png cr22-action-key_enter.png cr32-device-3floppy_mount.png cr32-mime-source_j.png cr32-action-math_lsup.png cr64-mime-quicktime.png cr16-mime-source_pl.png cr22-mime-wordprocessing.png cr16-device-usbpendrive_mount.png cr128-device-compact_flash_mount.png cr32-action-view_icon.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr128-mime-widget_doc.png cr64-filesys-folder_yellow_open.png cr16-action-mail_replyall.png cr128-filesys-folder_yellow_open.png cr16-mime-font_type1.png cr22-device-print_class.png crsc-mime-wordprocessing.svgz cr32-action-connect_established.png cr16-action-fileimport.png cr128-filesys-folder_orange_open.png cr22-mime-file_locked.png cr16-mime-source_s.png cr16-mime-source_l.png cr22-action-bookmark_folder.png crsc-filesys-folder_important.svgz cr64-mime-source_j.png cr22-mime-kexi_kexi.png cr22-mime-source_c.png crsc-filesys-file_locked.svgz cr16-filesys-folder_home.png cr32-action-help.png crsc-device-joystick.svgz cr128-mime-ascii.png crsc-action-filenew.svgz cr22-app-password.png cr16-action-mail_send.png cr128-filesys-folder_important.png crsc-filesys-pipe.svgz cr48-mime-metafont.png cr22-action-gear.png cr48-action-filenew.png cr32-action-music_flat.png cr16-action-music_cross.png crsc-device-hdd_mount.svgz cr64-filesys-folder_tar.png cr128-device-sd_mmc_mount.png cr64-mime-vcalendar.png cr32-action-math_abs.png cr16-mime-vcard.png cr128-filesys-lockoverlay.png cr16-action-kde4.png cr64-device-3floppy_unmount.png cr32-action-view_right.png cr22-action-reload_all_tabs.png cr64-mime-vcard.png cr64-mime-widget_doc.png cr48-mime-resource.png cr48-mime-pdf.png cr32-action-contents2.png cr16-action-window_fullscreen.png cr32-action-view_multicolumn.png cr16-mime-shellscript.png cr48-device-hdd_unmount.png cr32-action-messagebox_info.png cr48-action-up.png cr32-action-math_brace.png cr22-mime-vectorgfx.png cr16-action-2leftarrow.png cr48-mime-kivio_flw.png cr48-device-dvd_mount.png cr32-action-revert.png cr22-action-player_play.png cr48-device-zip_mount.png cr16-filesys-folder_orange.png cr32-mime-recycled.png crsc-filesys-folder_green_open.svgz cr32-action-player_rew.png cr22-action-finish.png cr16-device-sd_mmc_unmount.png cr16-device-scanner.png cr22-action-bookmark.png cr32-mime-source_c.png crsc-mime-source_cpp.svgz cr22-action-exec.png cr64-device-camera_mount.png cr48-filesys-folder_home2.png cr16-action-player_volume.png cr64-mime-mozilla_doc.png cr64-device-5floppy_unmount.png cr16-action-history_clear.png cr22-device-camera_mount.png crsc-device-5floppy_unmount.svgz cr16-action-music_cleficon.png cr48-mime-source_php.png cr16-action-mail_generic.png cr16-action-info.png cr64-mime-rpm.png cr16-mime-midi.png crsc-device-camera_mount.svgz crsc-mime-source_y.svgz cr22-filesys-folder_green.png cr128-filesys-folder_print.png cr16-action-paintbrush.png crsc-action-mail_new.svgz cr32-filesys-network_local.png cr22-mime-netscape_doc.png cr64-mime-make.png cr16-action-goto.png cr32-action-filequickprint.png cr22-filesys-folder_yellow_open.png cr48-mime-source_p.png cr48-action-misc.png crsc-mime-source_h.svgz cr48-device-camera_unmount.png cr16-mime-resource.png cr16-action-editpaste.png cr32-action-misc.png cr32-mime-deb.png cr16-mime-quicktime.png cr22-action-fileexport.png cr64-mime-source_java.png cr48-filesys-folder_txt.png cr48-filesys-folder_home.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr48-filesys-folder_outbox.png cr32-mime-file_locked.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.png cr16-device-5floppy_unmount.png cr64-filesys-folder_grey_open.png cr48-filesys-folder_orange.png cr128-device-usbpendrive_mount.png crsc-device-memory_stick_mount.svgz cr16-mime-source.png cr16-action-idea.png cr16-device-pda_blue.png cr22-action-text_bold.png cr32-action-text_super.png cr128-action-player_playlist.png cr32-device-compact_flash_mount.png crsc-mime-readme.svgz cr64-mime-source_f.png cr128-mime-source_o.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr22-filesys-folder_orange.png cr128-device-printer1.png cr48-action-forward.png cr22-action-emptytrash.png cr64-mime-sound.png cr48-mime-kchart_chrt.png cr32-app-password.png cr128-device-smart_media_mount.png cr128-filesys-folder_violet_open.png cr64-device-printer1.png cr22-action-mail_post_to3.png cr64-filesys-folder_sound.png cr22-action-colorize.png cr16-mime-spreadsheet.png cr16-mime-krita_kra.png crsc-mime-source_py.svgz cr16-action-view_tree.png cr48-filesys-lockoverlay.png crsc-mime-deb.svgz cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz cr48-mime-kformula_kfo.png cr16-action-gear.png cr32-device-5floppy_unmount.png crsc-filesys-trashcan_full.svgz cr48-filesys-folder_orange_open.png cr22-action-mail_replyall.png cr32-device-cdaudio_mount.png cr128-filesys-folder_image.png cr22-action-music_flat.png cr22-mime-message.png cr64-device-cdrom_mount.png cr64-mime-applix.png cr64-filesys-folder_favorite.png cr48-mime-deb.png cr32-mime-source_java.png cr128-filesys-folder_locked.png cr22-action-music_natur.png cr22-mime-pdf.png cr128-mime-source_py.png cr32-action-window_new.png cr32-mime-source_pl.png cr64-device-print_class.png crsc-filesys-folder_print.svgz cr128-device-camera_unmount.png cr16-mime-sound.png cr48-action-player_playlist.png cr32-filesys-network.png cr22-filesys-trashcan_full.png cr22-action-2rightarrow.png cr22-action-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-action-fileprint.png cr64-mime-document2.png crsc-action-share.svgz cr22-action-music_fullnote.png cr32-filesys-folder_important.png cr128-mime-krita_kra.png crsc-mime-cdr.svgz cr16-action-inline_image.png cr16-filesys-network_local.png cr64-filesys-file_broken.png cr64-device-memory_stick_unmount.png cr128-mime-midi.png cr22-action-previous.png cr16-action-colorpicker.png cr22-mime-kugar_kud.png cr16-mime-kpresenter_kpr.png cr16-mime-cdr.png cr32-device-memory_stick_mount.png crsc-filesys-folder_home.svgz cr32-action-view_text.png cr22-mime-txt.png cr16-filesys-folder_tar.png cr48-mime-colorscm.png cr16-device-5floppy_mount.png cr48-action-fileprint.png cr48-device-hdd_mount.png cr32-action-text_center.png cr16-action-tab_breakoff.png cr48-mime-kpresenter_kpr.png cr32-action-mail_send.png cr32-action-mail_forward.png cr16-action-mail_forward.png cr22-action-help.png cr32-action-lock.png cr64-mime-midi.png cr16-mime-kspread_ksp.png cr16-action-folder_new.png cr22-action-exit.png cr64-device-sd_mmc_unmount.png cr16-device-joystick.png cr64-mime-source_s.png cr16-action-ok.png cr32-filesys-folder_open.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_favorite.png cr48-filesys-folder_grey_open.png cr22-action-text_center.png cr64-mime-empty.png cr22-action-fontsizeup.png cr128-mime-vcard.png cr32-action-button_cancel.png cr32-action-frameprint.png cr16-action-frame_formula.png cr32-action-previous.png cr22-mime-karbon_karbon.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz crsc-mime-widget_doc.svgz cr22-mime-quicktime.png cr22-device-hdd_unmount.png cr64-filesys-trashcan_full.png crsc-mime-kexi_kexi.svgz cr64-filesys-folder_violet_open.png cr48-device-tv.png cr128-mime-font_type1.png cr22-action-inline_table.png cr16-action-encrypted.png cr32-mime-source_f.png cr16-action-contexthelp.png cr16-action-editshred.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr22-mime-vcard.png cr16-mime-widget_doc.png cr22-action-player_pause.png cr48-app-password.png cr128-filesys-pipe.png cr128-filesys-folder_html.png crsc-mime-font_type1.svgz cr22-action-contents2.png crsc-device-nfs_unmount.svgz crsc-mime-soffice.svgz cr22-action-gohome.png cr22-mime-source_h.png cr48-mime-quicktime.png cr16-mime-man.png cr22-action-forward.png cr48-device-cdaudio_unmount.png cr128-mime-applix.png cr22-mime-cdtrack.png cr32-action-forward.png cr22-mime-shellscript.png cr22-action-crop.png cr128-device-system.png cr64-filesys-pipe.png cr22-action-view_text.png cr16-action-tab_new_raised.png cr16-mime-kivio_flw.png cr48-mime-kspread_ksp.png cr16-mime-empty.png cr64-mime-image.png crsc-device-3floppy_mount.svgz cr64-mime-spreadsheet.png cr22-action-1rightarrow.png cr32-filesys-folder_video.png cr22-action-folder_new.png cr64-mime-encrypted.png crsc-mime-tar.svgz cr22-action-bottom.png cr48-mime-document.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png cr64-device-joystick.png cr48-filesys-folder_red_open.png crsc-mime-source_moc.svgz cr32-action-fileopen.png cr22-device-smart_media_mount.png cr16-mime-colorscm.png cr22-mime-font_bitmap.png cr16-mime-document2.png cr16-action-editdelete.png cr64-device-usbpendrive_unmount.png cr22-action-history.png cr64-device-memory_stick_mount.png cr32-device-chardevice.png cr16-action-view_bottom.png cr16-mime-dvi.png cr64-filesys-folder_home.png cr32-action-text_bold.png cr128-mime-koffice.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png cr32-action-toggle_log.png cr48-mime-make.png cr128-mime-unknown.png crsc-mime-spreadsheet.svgz cr16-action-player_time.png cr128-mime-quicktime.png cr48-mime-cdr.png cr22-mime-mozilla_doc.png crsc-device-chardevice.svgz cr128-filesys-folder_green_open.png cr32-mime-shellscript.png cr16-mime-vectorgfx.png cr16-action-text_super.png crsc-filesys-folder.svgz cr16-action-locationbar_erase.png cr64-filesys-folder_open.png crsc-device-5floppy_mount.svgz cr16-action-math_paren.png crsc-filesys-folder_grey.svgz cr16-action-fileclose.png crsc-action-lock.svgz cr128-device-mouse.png crsc-filesys-folder_orange.svgz cr32-action-music_fullnote.png cr22-mime-applix.png cr22-action-math_lsub.png cr22-filesys-folder_red.png crsc-mime-unknown.svgz crsc-device-smartmedia_unmount.svgz cr32-filesys-pipe.png cr22-action-back.png cr32-filesys-folder_orange.png cr64-device-memory.png cr48-mime-source_j.png cr128-device-usbpendrive_unmount.png cr32-action-view_choose.png cr32-action-bottom.png cr32-action-rightjust.png cr22-action-view_bottom.png crsc-device-system.svgz cr48-mime-message.png cr32-action-reload.png cr32-mime-font_bitmap.png cr48-mime-netscape_doc.png cr22-action-reload.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-mime-source_p.png cr32-action-charset.png crsc-device-mo_mount.svgz crsc-device-printer1.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr32-action-editdelete.png cr16-device-3floppy_unmount.png cr32-mime-misc.png cr48-mime-binary.png cr22-mime-kmultiple.png cr22-action-find.png cr128-action-frameprint.png cr16-action-filequickprint.png cr32-mime-empty.png cr128-device-print_class.png cr16-filesys-trashcan_empty.png cr64-device-tv.png cr32-action-locationbar_erase.png cr16-action-clear_left.png cr16-action-frame_text.png cr32-mime-tex.png cr32-action-filesave.png cr32-filesys-folder_home2.png cr48-mime-vcard.png cr48-mime-pk.png crsc-filesys-folder_violet.svgz cr16-action-filter.png cr32-mime-font_truetype.png cr128-mime-image.png cr32-mime-midi.png cr16-action-viewmag.png cr48-filesys-server.png cr64-mime-krita_kra.png crsc-device-tablet.svgz cr32-filesys-folder_violet_open.png cr32-action-configure.png cr32-action-edit.png cr128-mime-source_c.png cr22-action-music_fermatenote.png cr22-action-view_detailed.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-mime-resource.png cr32-action-text_sub.png cr16-action-music_natur.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.png cr22-action-text_left.png crsc-device-memory_stick_unmount.svgz cr22-mime-source_moc.png cr16-mime-make.png cr22-action-1downarrow.png cr128-mime-cdr.png cr22-action-player_playlist.png cr48-device-mo_unmount.png cr64-mime-wordprocessing.png cr22-action-launch.png cr128-mime-source_pl.png cr16-action-bookmarks_list_add.png cr32-action-run.png cr64-mime-tgz.png cr128-filesys-folder_open.png cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr16-filesys-trashcan_full.png cr128-filesys-folder_grey.png cr32-mime-ascii.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz cr32-action-fileclose.png cr22-action-misc.png cr22-action-text_under.png cr48-device-cdwriter_mount.png cr16-action-view_choose.png cr48-mime-source_y.png cr16-action-top.png cr32-device-mo_mount.png cr48-filesys-folder_video.png cr64-mime-zip.png crsc-mime-resource.svgz cr16-action-gohome.png cr22-filesys-folder_violet.png cr16-mime-txt.png crsc-filesys-folder_man.svgz cr16-action-player_pause.png cr16-action-player_stop.png cr22-device-smart_media_unmount.png cr128-mime-soffice.png cr22-action-rightjust.png cr128-mime-source_moc.png cr16-mime-karbon_karbon.png cr22-action-bookmark_add.png cr48-device-memory_stick_mount.png cr16-action-mail_reply.png cr64-mime-ascii.png crsc-mime-kugardata.svgz cr32-mime-tgz.png cr22-action-compfile.png cr22-action-inline_image.png cr64-action-share.png cr16-mime-gettext.png cr22-mime-unknown.png cr64-action-player_playlist.png cr48-device-memory.png cr32-mime-metafont.png cr48-action-wizard.png cr16-action-exec.png cr22-mime-exec_wine.png cr16-action-forward.png cr32-action-window_nofullscreen.png cr32-action-text_under.png cr128-mime-source_php.png cr32-mime-rpm.png cr32-action-queue.png cr48-action-mail_new.png cr48-filesys-folder_red.png crsc-mime-quicktime.svgz cr16-action-player_start.png cr22-action-bookmarks_list_add.png cr16-action-misc.png cr22-mime-make.png cr22-action-color_line.png cr64-device-blockdevice.png crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr48-mime-shellscript.png cr128-mime-font_truetype.png cr128-filesys-trashcan_full.png cr22-device-camera_unmount.png cr64-device-sd_mmc_mount.png cr16-action-signature.png cr16-action-math_lsup.png cr32-action-redo.png cr32-action-filefind.png cr128-action-contents2.png cr48-device-smart_media_unmount.png cr64-device-pda_black.png cr16-action-kde6.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr16-action-halfencrypted.png cr22-mime-source_y.png cr32-device-smart_media_unmount.png crsc-filesys-exec_wine.svgz cr32-action-mouse.png cr32-mime-postscript.png cr22-mime-kivio_flw.png cr32-device-memory.png cr22-action-math_matrix.png cr16-action-bookmark_toolbar.png cr48-mime-cdimage.png cr128-mime-deb.png crsc-mime-exec_wine.svgz cr16-mime-source_o.png cr32-action-save_all.png cr16-filesys-server.png cr22-action-mail_post_to.png cr16-filesys-folder_green_open.png cr48-mime-rpm.png cr16-action-music_halfnote.png cr22-action-start.png cr48-mime-source_h.png cr32-device-pda_blue.png cr16-device-blockdevice.png cr16-mime-source_cpp.png cr48-mime-spreadsheet.png cr32-action-contents.png cr32-filesys-folder_yellow.png cr48-device-print_class.png cr16-action-text_bold.png cr128-device-smart_media_unmount.png cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr22-action-player_end.png cr16-device-mo_mount.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr16-mime-message.png cr32-filesys-folder_yellow_open.png cr32-action-bookmark_toolbar.png crsc-filesys-folder_yellow.svgz cr64-device-cdaudio_unmount.png cr48-device-pda_blue.png cr64-mime-pdf.png cr16-action-math_frac.png cr32-action-bookmark_add.png crsc-device-tv.svgz cr22-filesys-trashcan_empty.png cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am cr16-filesys-folder_sent_mail.png cr48-filesys-ftp.png cr128-mime-source_l.png cr16-action-up.png cr128-filesys-zip.png cr64-mime-soffice.png cr32-action-editcut.png cr22-action-math_sqrt.png cr16-filesys-folder_green.png cr32-mime-man.png cr16-action-undo.png cr22-action-news_unsubscribe.png cr22-action-editclear.png cr16-action-frameprint.png crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png cr32-action-gear.png cr22-action-mail_send.png cr22-action-stop.png cr64-mime-vectorgfx.png cr22-mime-recycled.png cr22-action-viewmag-.png cr16-action-view_detailed.png cr16-device-camera_mount.png crsc-filesys-network.svgz cr32-action-music_natur.png cr22-action-frame_spreadsheet.png cr32-action-button_ok.png cr48-filesys-folder_open.png cr32-action-attach.png cr32-action-exec.png cr22-mime-txt2.png crsc-mime-netscape_doc.svgz cr22-action-redo.png cr64-filesys-folder_violet.png cr16-filesys-folder_red_open.png cr64-mime-source_o.png cr22-action-filesave.png cr48-mime-misc.png cr16-action-view_text.png cr22-action-mail_forward.png cr64-mime-binary.png crsc-mime-html.svgz cr16-action-kde3.png cr22-action-revert.png cr128-filesys-folder_home.png cr16-device-compact_flash_mount.png cr32-action-compfile.png cr128-mime-info.png cr48-mime-exec_wine.png cr32-mime-source_y.png cr16-action-identity.png cr16-action-rotate_ccw.png cr32-device-nfs_unmount.png cr22-action-connect_no.png cr32-filesys-ftp.png cr32-action-encrypted.png cr48-filesys-network.png cr32-action-mail_delete.png cr22-device-usbpendrive_unmount.png cr32-action-player_start.png cr22-action-toggle_log.png cr16-filesys-folder_violet.png cr22-action-math_onetwomatrix.png cr22-action-identity.png cr16-action-decrypted.png cr64-mime-message.png crsc-mime-document.svgz cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr22-action-math_brackets.png cr32-mime-kword_kwd.png cr16-mime-ascii.png cr22-action-math_sum.png cr32-action-start.png cr32-device-tv.png cr128-mime-font_bitmap.png cr16-action-edit.png cr16-action-2uparrow.png cr16-filesys-folder_red.png cr16-mime-netscape_doc.png cr32-action-music_halfnote.png crsc-filesys-folder_tar.svgz cr32-action-mail_get.png cr128-mime-document.png cr64-device-3floppy_mount.png cr16-action-view_top_bottom.png cr22-mime-ascii.png crsc-mime-source_j.svgz Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png cr32-filesys-lockoverlay.png crsc-mime-source_pl.svgz cr22-filesys-folder_open.png cr64-filesys-www.png crsc-filesys-lockoverlay.svgz crsc-mime-vcalendar.svgz cr22-device-joystick.png cr16-action-run.png cr128-mime-colorscm.png cr32-action-filter.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr48-mime-tar.png cr128-device-sd_mmc_unmount.png cr32-filesys-exec.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr48-mime-widget_doc.png cr22-device-usbpendrive_mount.png cr16-action-unlock.png crsc-filesys-home_blue.svgz cr32-mime-log.png cr16-mime-vcalendar.png cr16-action-1downarrow.png cr22-action-filter.png cr128-mime-rpm.png cr128-filesys-folder_green.png cr32-filesys-folder_orange_open.png cr128-mime-binary.png cr22-action-charset.png cr16-action-stamp.png cr16-filesys-folder_man.png cr32-action-folder_new.png cr22-action-text_super.png cr16-action-mail_find.png cr22-action-button_ok.png cr64-mime-kugar_kud.png cr128-mime-message.png cr22-action-today.png cr16-action-bottom.png cr64-mime-font.png cr32-filesys-folder_tar.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr16-mime-source_moc.png cr22-action-window_nofullscreen.png cr16-device-cdrom_mount.png cr48-mime-readme.png cr16-device-cdaudio_unmount.png cr64-mime-postscript.png cr16-device-smart_media_mount.png cr16-action-pencil.png cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png cr32-filesys-folder_sound.png crsc-action-contents2.svgz cr22-action-math_int.png cr128-filesys-folder_violet.png cr64-mime-source_l.png cr64-device-hdd_unmount.png cr32-mime-readme.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-gf.png cr16-filesys-folder_print.png cr128-mime-source_p.png crsc-device-zip_mount.svgz cr32-mime-pk.png cr16-action-mail_post_to.png cr16-device-system.png cr64-mime-source_p.png crsc-mime-pdf.svgz cr16-mime-source_f.png cr32-mime-kivio_flw.png cr22-filesys-folder_violet_open.png cr32-device-tablet.png cr16-action-1leftarrow.png cr22-action-editshred.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.png cr16-device-zip_mount.png cr22-action-edittrash.png cr128-mime-spreadsheet.png cr32-action-unindent.png cr128-filesys-folder_sound.png cr32-mime-source_moc.png cr128-action-fileprint.png cr64-mime-kword_kwd.png cr16-action-text_under.png cr16-mime-font_bitmap.png cr32-action-music_32ndnote.png cr16-mime-pdf.png cr16-device-mouse.png cr22-mime-encrypted.png crsc-filesys-zip.svgz cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr22-action-fileclose.png cr22-action-next.png cr32-mime-unknown.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-koffice.png cr48-mime-postscript.png cr16-action-player_rew.png cr16-action-stop.png cr16-action-fontsizedown.png cr32-action-filenew.png cr48-action-indent.png cr16-action-math_onetwomatrix.png cr16-action-connect_established.png cr16-action-editcut.png cr32-mime-font.png cr64-action-filequickprint.png cr64-mime-karbon_karbon.png cr48-action-down.png cr32-action-unlock.png cr48-filesys-folder_sound.png cr16-device-sd_mmc_mount.png cr32-mime-vcalendar.png cr32-action-back.png cr48-filesys-folder_crystal.png cr16-action-view_left_right.png cr16-mime-document.png cr32-action-view_remove.png cr16-action-text_italic.png cr64-filesys-folder_green.png cr128-filesys-desktop.png cr48-device-pda_black.png cr128-mime-video.png cr22-action-frameprint.png cr22-mime-font_type1.png crsc-device-compact_flash_mount.svgz cr22-action-viewmag+.png cr16-mime-html.png cr32-mime-txt.png cr32-filesys-folder_violet.png cr32-action-mail_replyall.png cr32-filesys-folder_image.png cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.png crsc-action-mail_generic.svgz cr22-action-clear_left.png cr22-mime-font_truetype.png cr16-action-music_flat.png cr48-device-camera_mount.png cr22-action-frame_image.png cr16-action-thumbnail.png cr32-mime-soffice.png cr48-device-system.png cr48-mime-font_bitmap.png cr22-action-idea.png cr48-filesys-trashcan_full.png cr32-mime-vectorgfx.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.png cr48-mime-dvi.png cr16-action-player_playlist.png cr32-mime-core.png cr16-filesys-folder_open.png cr32-mime-source_cpp.png crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.png cr16-action-next.png cr16-mime-image.png cr16-action-mail_new.png cr48-mime-recycled.png cr16-action-openterm.png cr64-mime-kpresenter_kpr.png cr32-mime-document2.png cr64-device-usbpendrive_mount.png cr22-mime-binary.png cr48-filesys-zip.png cr32-filesys-folder_man.png cr16-action-colorize.png cr22-mime-tex.png crsc-mime-tex.svgz cr16-action-bookmark_add.png cr16-mime-recycled.png cr32-action-find.png cr128-mime-kmultiple.png cr32-filesys-link.png cr22-mime-font.png crsc-mime-postscript.svgz cr16-action-viewmagfit.png crsc-mime-core.svgz cr64-mime-kspread_ksp.png cr64-device-pda_blue.png cr16-device-camera_unmount.png crsc-device-sd_mmc_unmount.svgz cr32-action-spellcheck.png cr22-mime-kspread_ksp.png cr22-action-fileopen.png cr128-filesys-trashcan_empty.png cr32-action-music_quarternote.png cr64-mime-source_cpp.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-mime-core.png cr128-device-hdd_mount.png cr64-device-5floppy_mount.png cr64-device-mo_unmount.png cr64-mime-info.png cr64-filesys-trashcan_empty.png cr22-action-editpaste.png cr32-action-text_italic.png cr22-action-folder.png cr64-device-smart_media_unmount.png cr22-action-locationbar_erase.png cr16-action-bookmark_folder.png cr16-action-project_open.png cr128-filesys-folder_red_open.png cr32-mime-image.png crsc-mime-mozilla_doc.svgz cr32-device-camera_unmount.png cr32-mime-netscape_doc.png cr22-action-1uparrow.png cr32-mime-cdtrack.png cr22-action-undo.png cr32-action-rebuild.png cr48-filesys-folder_yellow_open.png cr22-action-down.png cr32-filesys-folder_red.png cr22-action-news_subscribe.png cr32-mime-source_h.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr48-mime-source_java.png cr16-action-transform.png cr128-mime-txt2.png cr16-action-viewmag-.png cr16-device-dvd_unmount.png cr32-action-reload_page.png cr32-mime-applix.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png crsc-mime-gf.svgz cr16-action-completion.png cr64-device-tablet.png cr22-device-3floppy_unmount.png cr64-mime-txt.png cr32-action-viewmag+.png cr16-device-memory.png cr48-mime-font_type1.png cr16-mime-kugar_kud.png cr48-device-printer1.png crsc-action-text_under.svgz cr32-action-undo.png cr16-filesys-pipe.png cr32-filesys-folder_print.png cr16-mime-zip.png cr22-action-view_sidetree.png cr48-mime-empty.png cr22-mime-metafont.png cr32-action-messagebox_warning.png cr22-action-2uparrow.png cr16-action-player_fwd.png cr32-action-openterm.png cr22-action-openterm.png crsc-mime-font_truetype.svgz cr128-mime-man.png cr16-action-configure_toolbars.png cr32-device-dvd_mount.png cr32-mime-sound.png cr22-action-kde.png cr64-mime-metafont.png cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr22-action-math_prod.png cr128-mime-sound.png cr128-device-memory_stick_unmount.png crsc-filesys-folder_open.svgz cr22-action-editcut.png cr48-mime-tgz.png cr32-action-editclear.png cr22-mime-source_cpp.png crsc-filesys-www.svgz cr22-action-music_cleficon.png cr22-action-view_tree.png cr64-mime-font_bitmap.png cr48-mime-wordprocessing.png cr22-action-share.png cr48-mime-source_py.png cr64-filesys-folder_man.png cr22-action-1leftarrow.png cr128-device-camera_mount.png cr64-action-contents2.png cr32-filesys-folder_txt.png cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.png cr16-mime-tex.png cr48-device-nfs_unmount.png cr22-mime-colorscm.png cr32-mime-quicktime.png cr64-filesys-folder_image.png cr16-mime-unknown.png cr32-device-smart_media_mount.png cr16-mime-applix.png cr128-mime-mozilla_doc.png cr32-mime-source_py.png cr128-mime-vectorgfx.png cr16-mime-gf.png crsc-device-cdwriter_mount.svgz cr22-action-attach.png cr16-action-text_right.png cr16-device-smart_media_unmount.png cr16-action-contents2.png cr22-filesys-folder_home.png cr22-mime-source.png cr22-action-math_paren.png cr64-device-dvd_unmount.png cr48-device-5floppy_mount.png crsc-filesys-services.svgz cr64-mime-kchart_chrt.png cr16-action-math_matrix.png cr48-device-cdaudio_mount.png cr16-device-hdd_unmount.png cr32-action-math_frac.png cr16-action-compfile.png cr32-mime-kmultiple.png cr48-device-compact_flash_unmount.png cr128-device-blockdevice.png 
-+KDE_DIST=cr32-device-system.png cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png cr32-mime-template_source.png crsc-filesys-folder_favorite.svgz crsc-mime-zip.svgz cr16-action-about_kde.png cr32-action-mail_post_to.png cr16-mime-tar.png cr16-filesys-lockoverlay.png cr64-filesys-lockoverlay.png cr64-mime-exec_wine.png cr16-device-hdd_mount.png cr64-mime-source_y.png cr48-device-cdrom_mount.png cr22-action-player_eject.png cr32-mime-exec_wine.png cr22-mime-tgz.png cr32-action-text_block.png crsc-device-zip_unmount.svgz cr32-action-messagebox_critical.png cr32-device-mo_unmount.png cr16-device-tv.png cr48-mime-info.png cr16-filesys-link.png cr32-action-player_eject.png cr64-mime-shellscript.png cr22-mime-soffice.png cr16-device-printer1.png cr22-action-math_brace.png cr32-filesys-file_broken.png crsc-mime-video.svgz cr22-action-window_new.png cr16-action-move.png cr128-mime-misc.png cr64-action-frameprint.png cr32-action-leftjust.png cr16-action-music_32ndnote.png cr16-action-2rightarrow.png cr64-mime-html.png cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png cr16-action-editclear.png crsc-filesys-home_white.svgz cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr16-filesys-folder_important.png cr22-action-music_quarternote.png cr64-device-smart_media_mount.png cr32-device-cdwriter_unmount.png cr48-mime-source_o.png crsc-filesys-folder_locked.svgz cr64-mime-cdr.png cr48-mime-encrypted.png cr48-action-frameprint.png cr32-mime-make.png cr22-action-thumbnail.png cr128-filesys-folder_yellow.png crsc-mime-source.svgz cr16-action-news_subscribe.png cr22-device-memory_stick_unmount.png cr48-action-share.png crsc-mime-cdtrack.svgz cr22-filesys-folder_grey.png cr16-mime-postscript.png cr64-filesys-zip.png cr32-filesys-desktop.png cr32-mime-pdf.png cr16-action-text.png cr48-filesys-link.png cr22-mime-source_o.png cr16-mime-news.png cr128-mime-source_h.png crsc-filesys-folder_green.svgz cr16-action-filefind.png crsc-action-fileprint.svgz cr22-action-mail_find.png cr32-action-next.png cr64-mime-video.png cr16-action-save_all.png cr64-mime-gf.png cr128-mime-metafont.png cr48-mime-txt.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr48-filesys-folder_violet.png cr128-mime-source.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png cr22-mime-info.png cr32-action-bookmark_folder.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr22-action-mail_new3.png cr128-mime-source_f.png cr16-mime-misc.png cr16-action-player_play.png cr22-action-mail_delete.png cr32-action-view_top_bottom.png cr22-action-button_cancel.png cr22-mime-kformula_kfo.png cr32-action-share.png cr32-mime-gf.png cr16-action-window_nofullscreen.png cr16-filesys-folder_html.png cr64-device-nfs_unmount.png cr16-action-fileopen.png cr16-action-player_end.png cr64-mime-source_php.png cr48-mime-source_moc.png cr128-app-password.png cr22-action-make_kdevelop.png cr22-action-encrypted.png cr48-device-tablet.png cr16-action-filesaveas.png cr48-device-mo_mount.png crsc-mime-source_o.svgz cr48-filesys-file_broken.png cr48-action-back.png cr32-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr48-action-filequickprint.png cr64-device-cdaudio_mount.png cr128-mime-pdf.png cr16-action-text_center.png cr22-action-pencil.png cr32-mime-tar.png cr64-mime-misc.png crsc-device-hdd_unmount.svgz cr128-mime-font.png cr16-action-eraser.png cr22-action-filenew.png cr16-action-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.png cr48-device-usbpendrive_mount.png cr32-action-music_fermatenote.png crsc-device-scanner.svgz cr16-action-flag.png cr22-action-rotate_ccw.png cr16-action-text_strike.png cr22-action-text_right.png cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr22-action-music_halfnote.png cr16-action-lock.png cr64-mime-dvi.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr16-action-remove.png cr22-action-view_choose.png cr22-action-translate.png cr64-mime-man.png cr32-action-down.png cr22-mime-source_j.png cr16-action-blend.png cr48-filesys-folder_print.png cr22-mime-image.png cr22-mime-krita_kra.png crsc-filesys-network_local.svgz cr48-mime-gettext.png cr32-action-bookmark.png crsc-action-text_bild.svgz crsc-filesys-folder_blue.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr22-action-project_open.png cr48-filesys-folder_yellow.png cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png crsc-mime-ascii.svgz cr48-device-sd_mmc_mount.png cr128-mime-readme.png cr22-action-music_dottednote.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png crsc-mime-source_s.svgz cr32-mime-txt2.png cr22-action-mail_reply.png cr32-device-usbpendrive_mount.png cr16-mime-core.png cr128-mime-resource.png cr16-filesys-folder_orange_open.png cr32-action-stop.png cr128-mime-pk.png cr16-mime-kword_kwd.png cr22-action-queue.png cr16-action-exit.png cr16-action-viewmag+.png cr32-device-blockdevice.png cr48-mime-man.png cr64-mime-source.png cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz cr32-device-nfs_mount.png cr16-action-revert.png cr22-mime-source_l.png cr22-action-view_left_right.png cr32-action-exit.png crsc-mime-pk.svgz cr22-action-up.png cr16-action-share.png cr16-mime-source_php.png cr32-mime-font_type1.png cr16-action-translate.png cr16-device-memory_stick_unmount.png cr64-mime-deb.png cr32-action-music_cross.png cr16-action-finish.png cr128-device-compact_flash_unmount.png cr64-mime-kmultiple.png cr16-action-text_left.png cr64-filesys-desktop.png cr16-action-reload.png cr16-mime-rpm.png cr64-mime-readme.png cr16-filesys-folder.png cr22-mime-rpm.png cr64-device-zip_mount.png cr32-mime-document.png cr32-mime-video.png cr128-filesys-folder_home2.png cr16-device-cdwriter_unmount.png cr22-action-halfencrypted.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-bookmarks_list_add.png cr16-action-reload_page.png cr128-mime-exec_wine.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png crsc-action-text_super.svgz cr48-device-smart_media_mount.png crsc-action-frameprint.svgz cr16-mime-kformula_kfo.png cr22-mime-source_py.png cr48-mime-source_c.png cr32-device-cdrom_unmount.png cr22-mime-dvi.png cr16-action-music_fermatenote.png cr16-action-emptytrash.png cr32-action-fonts.png cr16-action-fill.png cr64-mime-unknown.png cr22-action-viewmag1.png cr32-mime-kpresenter_kpr.png cr16-mime-metafont.png crsc-device-mouse.svgz cr128-action-filequickprint.png cr32-action-blend.png cr16-action-music_sixteenthnote.png cr22-mime-source_p.png crsc-action-text_bold.svg cr128-filesys-folder_red.png cr48-action-gear.png cr22-action-player_rew.png crsc-mime-vectorgfx.svgz cr64-app-password.png cr48-mime-ascii.png index.theme cr22-mime-kchart_chrt.png cr16-filesys-file_broken.png crsc-filesys-folder_yellow_open.svgz cr64-filesys-folder_important.png crsc-mime-shellscript.svgz cr16-action-charset.png cr22-filesys-folder_grey_open.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz crsc-filesys-folder_violet_open.svgz cr22-action-player_fwd.png cr16-device-memory_stick_mount.png cr16-action-edittrash.png cr16-action-rotate.png cr16-action-connect_no.png cr22-action-about_kde.png cr16-action-frame_query.png cr16-action-math_rsub.png cr48-action-unindent.png cr16-mime-info.png crsc-filesys-link.svgz cr48-action-fileclose.png cr128-mime-tex.png cr22-action-music_sixteenthnote.png cr22-mime-gf.png cr16-filesys-folder_home2.png crsc-filesys-folder_html.svgz cr22-filesys-folder_green_open.png cr32-mime-kugar_kud.png cr32-action-math_paren.png cr32-mime-source.png cr32-action-math_rsub.png cr128-mime-source_j.png cr128-filesys-exec.png cr128-mime-source_y.png cr48-device-dvd_unmount.png cr16-mime-deb.png crsc-filesys-folder_txt.svgz cr32-filesys-folder_green.png cr22-action-connect_established.png crsc-filesys-file_important.svgz crsc-filesys-folder_red_open.svgz cr22-action-frame_text.png cr48-mime-karbon_karbon.png cr16-action-back.png crsc-mime-tgz.svgz cr128-filesys-folder_txt.png crsc-mime-log.svgz cr32-mime-kspread_ksp.png cr22-action-decrypted.png cr16-action-viewmag1.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr32-action-player_pause.png cr16-mime-tgz.png cr16-filesys-network.png cr32-action-mail_generic.png cr22-action-view_icon.png cr16-filesys-www.png cr22-filesys-folder_yellow.png cr16-action-math_sum.png crsc-action-info.svgz cr48-filesys-desktop.png cr48-mime-tex.png cr32-action-rotate_cw.png cr16-action-editcopy.png cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.png crsc-mime-file_temporary.svgz cr64-mime-font_truetype.png cr22-mime-readme.png cr32-action-gohome.png cr16-mime-source_py.png cr48-mime-source_cpp.png cr22-action-view_top_bottom.png cr22-mime-cdimage.png cr16-mime-cdimage.png cr64-filesys-folder_home2.png cr16-action-previous.png cr16-device-cdwriter_mount.png cr32-device-scanner.png cr32-mime-kexi_kexi.png cr16-action-view_icon.png cr22-action-top.png cr32-action-emptytrash.png cr16-device-mo_unmount.png cr22-action-signature.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-filesys-zip.png cr32-action-filesaveas.png cr32-mime-gettext.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr32-action-player_play.png cr16-action-color_fill.png cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.png cr128-mime-txt.png cr64-mime-recycled.png crsc-device-usbpendrive_mount.svgz cr32-filesys-trashcan_full.png cr32-action-player_playlist.png cr22-mime-spreadsheet.png cr22-action-music_32ndnote.png cr22-action-centrejust.png cr48-filesys-folder_html.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr64-mime-pk.png cr16-action-rotate_cw.png crsc-device-memory.svgz cr16-filesys-folder_favorite.png cr22-action-reload_page.png cr22-action-window_fullscreen.png cr16-action-configure.png cr128-mime-vcalendar.png cr32-action-contexthelp.png cr22-action-configure.png cr22-mime-vcalendar.png cr16-action-math_brace.png cr16-filesys-folder_image.png crsc-mime-source_f.svgz cr22-device-memory_stick_mount.png cr128-mime-encrypted.png cr32-action-viewmag1.png cr16-action-view_sidetree.png crsc-action-filequickprint.svgz cr32-mime-spreadsheet.png cr16-device-chardevice.png cr16-mime-source_c.png cr32-action-viewmag-.png cr128-mime-cdtrack.png cr16-mime-binary.png cr16-mime-txt2.png cr16-mime-kchart_chrt.png crsc-filesys-folder_red.svgz cr64-mime-cdimage.png cr22-action-leftjust.png crsc-filesys-exec.svgz cr32-action-window_fullscreen.png cr48-mime-source_l.png cr16-filesys-folder_violet_open.png cr32-action-mail_new.png cr48-device-sd_mmc_unmount.png cr128-filesys-folder_orange.png cr48-mime-midi.png cr64-device-cdwriter_mount.png cr32-mime-kformula_kfo.png cr48-mime-font.png cr64-device-system.png cr16-mime-font.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.png cr22-mime-document.png cr32-action-text_right.png cr32-action-music_cleficon.png cr16-action-reload_all_tabs.png cr48-device-usbpendrive_unmount.png cr64-filesys-folder_green_open.png cr48-mime-image.png cr32-action-connect_creating.png cr22-action-player_stop.png cr22-filesys-folder_red_open.png crsc-mime-koffice.svgz cr64-mime-colorscm.png cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr48-action-identity.png cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr16-action-find.png cr22-device-sd_mmc_unmount.png cr16-action-math_prod.png cr32-action-wizard.png cr32-action-mail_reply.png cr64-device-mouse.png cr16-mime-source_h.png cr22-action-run.png cr128-filesys-folder_tar.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr128-filesys-network.png crsc-device-compact_flash_unmount.svgz cr32-action-view_bottom.png cr32-action-mail_find.png crsc-mime-message.svgz cr16-action-math_brackets.png cr22-mime-file_temporary.png cr48-action-bookmark.png cr48-filesys-folder_green_open.png cr22-action-move.png cr48-mime-soffice.png cr16-action-no.png cr22-device-sd_mmc_mount.png cr16-action-frame_edit.png cr16-action-filenew.png cr22-action-contexthelp.png cr48-mime-video.png cr16-action-make_kdevelop.png cr22-action-message_reply.png cr16-action-fork.png cr128-mime-postscript.png cr16-app-password.png cr22-mime-deb.png cr32-action-about_kde.png cr16-action-connect_creating.png crsc-mime-man.svgz cr16-action-window_new.png crsc-action-about_kde.svgz cr22-filesys-www.png cr32-action-text_strike.png cr22-device-printer1.png cr48-filesys-network_local.png cr64-mime-kivio_flw.png cr48-filesys-exec.png cr48-filesys-folder_important.png cr128-mime-karbon_karbon.png cr32-action-math_prod.png cr48-mime-kword_kwd.png cr16-action-attach.png cr128-mime-netscape_doc.png cr22-action-text_italic.png crsc-mime-kmultiple.svgz cr32-action-math_int.png cr128-mime-empty.png cr128-mime-recycled.png cr64-device-dvd_mount.png cr22-action-mail_new.png cr32-mime-cdr.png cr22-device-compact_flash_unmount.png cr32-mime-krita_kra.png cr128-device-memory_stick_mount.png cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_orange_open.png cr64-filesys-folder_grey.png cr48-mime-kexi_kexi.png cr32-action-player_stop.png cr32-filesys-www.png crsc-filesys-folder_blue_open.svgz cr48-device-nfs_mount.png cr16-action-mail_replylist.png cr32-action-math_onetwomatrix.png cr16-action-airbrush.png cr22-action-colorpicker.png cr48-device-joystick.png cr16-mime-source_y.png crsc-filesys-file_broken.svgz cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr22-action-math_abs.png cr32-device-camera_mount.png cr32-action-make_kdevelop.png cr128-filesys-network_local.png cr16-mime-readme.png cr48-filesys-folder_tar.png cr16-filesys-folder_video.png cr32-mime-source_s.png cr64-filesys-folder_txt.png crsc-mime-make.svgz cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.png crsc-mime-applix.svgz cr16-filesys-zip.png cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.png cr22-action-color_fill.png cr48-filesys-folder_green.png cr48-filesys-folder_violet_open.png cr22-action-math_frac.png cr32-filesys-folder_favorite.png cr64-filesys-folder_print.png cr32-mime-source_o.png cr16-action-music_fullnote.png cr128-filesys-folder_video.png cr22-mime-midi.png cr32-action-fileimport.png cr64-mime-core.png cr32-action-colorize.png cr64-filesys-folder_locked.png cr22-action-filefind.png cr64-device-hdd_mount.png cr32-action-view_tree.png cr128-action-share.png cr32-action-today.png cr64-filesys-folder_video.png cr32-mime-file_temporary.png svgz-action-text_italic.svgz cr32-filesys-folder_grey_open.png cr48-device-scanner.png cr128-mime-dvi.png cr32-action-math_matrix.png cr16-device-compact_flash_unmount.png cr64-filesys-exec.png cr128-device-hdd_unmount.png cr16-action-math_int.png cr32-device-dvd_unmount.png cr16-action-math_sqrt.png crsc-action-configure.svgz cr48-mime-source_f.png crsc-filesys-desktop.svgz cr32-device-compact_flash_unmount.png cr128-mime-document2.png cr32-action-indent.png crsc-mime-recycled.svgz cr16-action-bookmark.png cr32-device-cdwriter_mount.png cr32-mime-source_l.png cr48-mime-zip.png cr22-filesys-desktop.png cr32-action-top.png cr16-action-kde5.png cr48-device-cdwriter_unmount.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr128-filesys-folder_favorite.png cr16-action-contents.png cr22-mime-koffice.png cr16-action-frame_spreadsheet.png cr128-mime-template_source.png cr32-mime-dvi.png cr128-filesys-www.png crsc-device-blockdevice.svgz cr22-action-reload3.png cr22-action-goto.png crsc-mime-image.svgz cr16-action-math_abs.png cr22-device-compact_flash_mount.png cr32-device-5floppy_mount.png cr48-device-blockdevice.png cr48-mime-kmultiple.png crsc-filesys-folder_man2.svgz cr16-action-tab_remove.png cr48-mime-kugar_kud.png cr22-action-mouse.png cr22-mime-source_java.png crsc-mime-source_java.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr16-device-tablet.png cr48-mime-template_source.png cr32-action-player_end.png crsc-mime-source_p.svgz crsc-filesys-folder_orange_open.svgz cr32-action-text_left.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr16-filesys-desktop.png cr32-mime-cdimage.png cr22-mime-video.png cr22-device-system.png cr16-action-tab_new.png cr64-filesys-folder_orange.png crsc-action-mail_post_to.svgz cr64-filesys-folder_yellow.png cr32-action-finish.png cr16-action-1uparrow.png cr32-mime-karbon_karbon.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-filesys-folder_sound.svgz cr128-filesys-file_broken.png cr16-action-wizard.png cr16-action-math_rsup.png cr32-device-pda_black.png cr48-mime-source_pl.png cr32-action-viewmag.png crsc-mime-rpm.svgz crsc-device-cdwriter_unmount.svgz cr22-filesys-folder_print.png cr32-mime-vcard.png cr48-device-chardevice.png cr48-mime-source_s.png crsc-action-exit.svgz cr64-device-nfs_mount.png crsc-device-dvd_unmount.svgz cr64-mime-source_moc.png cr32-action-clear_left.png cr22-action-text_block.png cr48-mime-krita_kra.png cr48-device-mouse.png crsc-mime-source_l.svgz cr128-mime-source_s.png cr16-mime-source_java.png crsc-mime-txt2.svgz cr16-action-services.png cr64-device-mo_mount.png cr22-action-mail_replylist.png cr64-filesys-folder_html.png crsc-action-text_sub.svgz cr32-action-player_fwd.png cr64-mime-source_h.png cr22-mime-source_s.png cr64-filesys-network_local.png cr48-mime-log.png cr22-action-rebuild.png cr48-action-lock.png cr32-device-print_class.png cr32-action-edittrash.png cr22-action-unlock.png cr22-action-save_all.png cr16-device-print_class.png crsc-mime-source_c.svgz cr22-filesys-folder.png crsc-device-dvd_mount.svgz cr16-filesys-folder_inbox.png cr48-mime-cdtrack.png cr16-action-view_right.png cr16-action-frame_image.png cr64-device-camera_unmount.png cr32-filesys-folder.png cr16-action-redo.png crsc-device-mo_umount.svgz cr16-filesys-folder_outbox.png cr32-device-joystick.png cr22-action-fill.png cr16-action-cancel.png cr22-action-key_enter.png cr32-device-3floppy_mount.png cr32-mime-source_j.png cr32-action-math_lsup.png cr64-mime-quicktime.png cr16-mime-source_pl.png cr22-mime-wordprocessing.png cr16-device-usbpendrive_mount.png cr32-action-view_icon.png cr128-device-compact_flash_mount.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr64-filesys-folder_yellow_open.png cr128-mime-widget_doc.png cr16-action-mail_replyall.png cr128-filesys-folder_yellow_open.png cr16-mime-font_type1.png cr22-device-print_class.png crsc-mime-wordprocessing.svgz cr16-action-fileimport.png cr32-action-connect_established.png cr22-mime-file_locked.png cr128-filesys-folder_orange_open.png cr16-mime-source_s.png cr16-mime-source_l.png crsc-filesys-folder_important.svgz cr22-action-bookmark_folder.png cr22-mime-kexi_kexi.png cr64-mime-source_j.png cr22-mime-source_c.png cr16-filesys-folder_home.png cr32-action-help.png crsc-filesys-file_locked.svgz crsc-device-joystick.svgz crsc-action-filenew.svgz cr128-mime-ascii.png cr22-app-password.png cr128-filesys-folder_important.png cr16-action-mail_send.png cr48-mime-metafont.png crsc-filesys-pipe.svgz cr48-action-filenew.png cr22-action-gear.png cr32-action-music_flat.png cr16-action-music_cross.png crsc-device-hdd_mount.svgz cr64-filesys-folder_tar.png cr128-device-sd_mmc_mount.png cr64-mime-vcalendar.png cr32-action-math_abs.png cr16-mime-vcard.png cr128-filesys-lockoverlay.png cr16-action-kde4.png cr64-device-3floppy_unmount.png cr32-action-view_right.png cr64-mime-vcard.png cr22-action-reload_all_tabs.png cr64-mime-widget_doc.png cr48-mime-resource.png cr32-action-contents2.png cr48-mime-pdf.png cr32-action-view_multicolumn.png cr16-mime-shellscript.png cr16-action-window_fullscreen.png cr48-device-hdd_unmount.png cr32-action-messagebox_info.png cr48-action-up.png cr32-action-math_brace.png cr22-mime-vectorgfx.png cr48-device-dvd_mount.png cr48-mime-kivio_flw.png cr16-action-2leftarrow.png cr48-device-zip_mount.png cr32-action-revert.png cr22-action-player_play.png crsc-filesys-folder_green_open.svgz cr32-mime-recycled.png cr16-filesys-folder_orange.png cr32-action-player_rew.png cr22-action-finish.png cr16-device-sd_mmc_unmount.png cr16-device-scanner.png cr22-action-bookmark.png cr32-mime-source_c.png crsc-mime-source_cpp.svgz cr22-action-exec.png cr64-device-camera_mount.png cr48-filesys-folder_home2.png cr16-action-player_volume.png cr64-device-5floppy_unmount.png cr64-mime-mozilla_doc.png cr16-action-history_clear.png cr22-device-camera_mount.png crsc-device-5floppy_unmount.svgz cr16-action-music_cleficon.png cr48-mime-source_php.png cr16-action-mail_generic.png cr16-action-info.png cr64-mime-rpm.png cr16-mime-midi.png crsc-device-camera_mount.svgz crsc-mime-source_y.svgz cr22-filesys-folder_green.png cr128-filesys-folder_print.png cr16-action-paintbrush.png crsc-action-mail_new.svgz cr22-mime-netscape_doc.png cr32-filesys-network_local.png cr64-mime-make.png cr16-action-goto.png cr32-action-filequickprint.png cr22-filesys-folder_yellow_open.png cr48-action-misc.png cr48-mime-source_p.png crsc-mime-source_h.svgz cr48-device-camera_unmount.png cr16-mime-resource.png cr16-action-editpaste.png cr32-action-misc.png cr22-action-fileexport.png cr16-mime-quicktime.png cr32-mime-deb.png cr64-mime-source_java.png cr48-filesys-folder_home.png cr48-filesys-folder_txt.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr32-mime-file_locked.png cr48-filesys-folder_outbox.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.png cr16-device-5floppy_unmount.png cr64-filesys-folder_grey_open.png cr48-filesys-folder_orange.png cr128-device-usbpendrive_mount.png crsc-device-memory_stick_mount.svgz cr16-mime-source.png cr16-action-idea.png cr22-action-text_bold.png cr16-device-pda_blue.png cr32-action-text_super.png cr128-action-player_playlist.png crsc-mime-readme.svgz cr128-mime-source_o.png cr64-mime-source_f.png cr32-device-compact_flash_mount.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr48-action-forward.png cr128-device-printer1.png cr22-filesys-folder_orange.png cr22-action-emptytrash.png cr64-mime-sound.png cr48-mime-kchart_chrt.png cr32-app-password.png cr128-device-smart_media_mount.png cr128-filesys-folder_violet_open.png cr64-device-printer1.png cr64-filesys-folder_sound.png cr22-action-mail_post_to3.png cr22-action-colorize.png cr16-mime-spreadsheet.png cr16-mime-krita_kra.png cr16-action-view_tree.png crsc-mime-source_py.svgz cr48-filesys-lockoverlay.png crsc-mime-deb.svgz cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz cr48-mime-kformula_kfo.png cr16-action-gear.png cr32-device-5floppy_unmount.png crsc-filesys-trashcan_full.svgz cr22-action-mail_replyall.png cr48-filesys-folder_orange_open.png cr32-device-cdaudio_mount.png cr22-mime-message.png cr128-filesys-folder_image.png cr22-action-music_flat.png cr64-device-cdrom_mount.png cr64-mime-applix.png cr48-mime-deb.png cr32-mime-source_java.png cr64-filesys-folder_favorite.png cr22-action-music_natur.png cr128-filesys-folder_locked.png cr22-mime-pdf.png cr128-mime-source_py.png cr32-action-window_new.png cr32-mime-source_pl.png cr64-device-print_class.png crsc-filesys-folder_print.svgz cr128-device-camera_unmount.png cr16-mime-sound.png cr48-action-player_playlist.png cr32-filesys-network.png cr22-filesys-trashcan_full.png cr22-action-2rightarrow.png cr22-action-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-action-fileprint.png cr64-mime-document2.png cr22-action-music_fullnote.png crsc-action-share.svgz crsc-mime-cdr.svgz cr32-filesys-folder_important.png cr128-mime-krita_kra.png cr16-action-inline_image.png cr16-filesys-network_local.png cr64-filesys-file_broken.png cr64-device-memory_stick_unmount.png cr128-mime-midi.png cr16-action-colorpicker.png cr22-action-previous.png cr22-mime-kugar_kud.png cr16-mime-kpresenter_kpr.png cr16-mime-cdr.png cr32-device-memory_stick_mount.png crsc-filesys-folder_home.svgz cr32-action-view_text.png cr22-mime-txt.png cr16-filesys-folder_tar.png cr48-mime-colorscm.png cr16-device-5floppy_mount.png cr48-action-fileprint.png cr32-action-text_center.png cr48-device-hdd_mount.png cr48-mime-kpresenter_kpr.png cr16-action-tab_breakoff.png cr32-action-mail_send.png cr32-action-mail_forward.png cr16-action-mail_forward.png cr22-action-help.png cr32-action-lock.png cr16-mime-kspread_ksp.png cr64-mime-midi.png cr22-action-exit.png cr16-action-folder_new.png cr64-device-sd_mmc_unmount.png cr16-device-joystick.png cr64-mime-source_s.png cr16-action-ok.png cr32-filesys-folder_open.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_favorite.png cr48-filesys-folder_grey_open.png cr22-action-text_center.png cr64-mime-empty.png cr22-action-fontsizeup.png cr128-mime-vcard.png cr32-action-button_cancel.png cr32-action-frameprint.png cr16-action-frame_formula.png cr22-mime-karbon_karbon.png cr32-action-previous.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz cr22-mime-quicktime.png crsc-mime-widget_doc.svgz cr22-device-hdd_unmount.png cr64-filesys-trashcan_full.png cr64-filesys-folder_violet_open.png crsc-mime-kexi_kexi.svgz cr48-device-tv.png cr128-mime-font_type1.png cr22-action-inline_table.png cr16-action-encrypted.png cr16-action-contexthelp.png cr16-action-editshred.png cr32-mime-source_f.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr22-mime-vcard.png cr16-mime-widget_doc.png cr128-filesys-pipe.png cr48-app-password.png cr22-action-player_pause.png crsc-mime-font_type1.svgz cr128-filesys-folder_html.png crsc-device-nfs_unmount.svgz cr22-action-contents2.png crsc-mime-soffice.svgz cr22-action-gohome.png cr22-mime-source_h.png cr48-mime-quicktime.png cr16-mime-man.png cr22-action-forward.png cr48-device-cdaudio_unmount.png cr128-mime-applix.png cr22-mime-cdtrack.png cr32-action-forward.png cr22-mime-shellscript.png cr22-action-crop.png cr128-device-system.png cr64-filesys-pipe.png cr22-action-view_text.png cr48-mime-kspread_ksp.png cr16-mime-kivio_flw.png cr16-action-tab_new_raised.png cr16-mime-empty.png cr64-mime-image.png crsc-device-3floppy_mount.svgz cr64-mime-spreadsheet.png cr22-action-1rightarrow.png cr32-filesys-folder_video.png cr22-action-folder_new.png cr64-mime-encrypted.png crsc-mime-tar.svgz cr22-action-bottom.png cr48-mime-document.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png cr48-filesys-folder_red_open.png cr64-device-joystick.png crsc-mime-source_moc.svgz cr32-action-fileopen.png cr22-device-smart_media_mount.png cr16-mime-colorscm.png cr22-mime-font_bitmap.png cr16-mime-document2.png cr16-action-editdelete.png cr64-device-usbpendrive_unmount.png cr22-action-history.png cr64-device-memory_stick_mount.png cr32-device-chardevice.png cr16-action-view_bottom.png cr64-filesys-folder_home.png cr16-mime-dvi.png cr32-action-text_bold.png cr128-mime-koffice.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png cr32-action-toggle_log.png cr48-mime-make.png cr128-mime-unknown.png crsc-mime-spreadsheet.svgz cr16-action-player_time.png cr128-mime-quicktime.png cr48-mime-cdr.png cr22-mime-mozilla_doc.png crsc-device-chardevice.svgz cr128-filesys-folder_green_open.png cr32-mime-shellscript.png cr16-mime-vectorgfx.png crsc-filesys-folder.svgz cr16-action-text_super.png cr64-filesys-folder_open.png cr16-action-locationbar_erase.png crsc-device-5floppy_mount.svgz cr16-action-math_paren.png crsc-filesys-folder_grey.svgz cr16-action-fileclose.png crsc-action-lock.svgz cr128-device-mouse.png crsc-filesys-folder_orange.svgz cr32-action-music_fullnote.png cr22-action-math_lsub.png cr22-mime-applix.png cr22-filesys-folder_red.png crsc-mime-unknown.svgz crsc-device-smartmedia_unmount.svgz cr64-device-memory.png cr32-filesys-folder_orange.png cr22-action-back.png cr32-filesys-pipe.png cr48-mime-source_j.png cr128-device-usbpendrive_unmount.png cr32-action-view_choose.png cr32-action-bottom.png cr32-action-rightjust.png cr22-action-view_bottom.png crsc-device-system.svgz cr48-mime-message.png cr32-action-reload.png cr32-mime-font_bitmap.png cr22-action-reload.png cr48-mime-netscape_doc.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-action-charset.png cr32-mime-source_p.png crsc-device-mo_mount.svgz crsc-device-printer1.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr16-device-3floppy_unmount.png cr32-action-editdelete.png cr32-mime-misc.png cr48-mime-binary.png cr22-mime-kmultiple.png cr128-action-frameprint.png cr22-action-find.png cr32-mime-empty.png cr16-action-filequickprint.png cr16-filesys-trashcan_empty.png cr128-device-print_class.png cr64-device-tv.png cr32-action-locationbar_erase.png cr16-action-clear_left.png cr16-action-frame_text.png cr32-action-filesave.png cr32-mime-tex.png cr32-filesys-folder_home2.png cr48-mime-vcard.png cr48-mime-pk.png cr16-action-filter.png cr32-mime-font_truetype.png crsc-filesys-folder_violet.svgz cr128-mime-image.png cr32-mime-midi.png cr16-action-viewmag.png cr48-filesys-server.png cr64-mime-krita_kra.png crsc-device-tablet.svgz cr32-filesys-folder_violet_open.png cr32-action-configure.png cr32-action-edit.png cr128-mime-source_c.png cr22-action-view_detailed.png cr22-action-music_fermatenote.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-action-text_sub.png cr16-action-music_natur.png cr32-mime-resource.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.png cr22-action-text_left.png crsc-device-memory_stick_unmount.svgz cr22-mime-source_moc.png cr22-action-1downarrow.png cr16-mime-make.png cr128-mime-cdr.png cr48-device-mo_unmount.png cr22-action-player_playlist.png cr64-mime-wordprocessing.png cr22-action-launch.png cr128-mime-source_pl.png cr16-action-bookmarks_list_add.png cr64-mime-tgz.png cr32-action-run.png cr128-filesys-folder_open.png cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr16-filesys-trashcan_full.png cr32-mime-ascii.png cr128-filesys-folder_grey.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz cr22-action-misc.png cr22-action-text_under.png cr32-action-fileclose.png cr48-device-cdwriter_mount.png cr16-action-view_choose.png cr16-action-top.png cr48-mime-source_y.png cr32-device-mo_mount.png cr48-filesys-folder_video.png cr64-mime-zip.png crsc-mime-resource.svgz cr16-action-gohome.png cr22-filesys-folder_violet.png crsc-filesys-folder_man.svgz cr16-mime-txt.png cr16-action-player_stop.png cr16-action-player_pause.png cr22-device-smart_media_unmount.png cr22-action-rightjust.png cr128-mime-soffice.png cr128-mime-source_moc.png cr16-mime-karbon_karbon.png cr22-action-bookmark_add.png cr48-device-memory_stick_mount.png cr16-action-mail_reply.png cr64-mime-ascii.png crsc-mime-kugardata.svgz cr32-mime-tgz.png cr22-action-inline_image.png cr22-action-compfile.png cr64-action-share.png cr16-mime-gettext.png cr22-mime-unknown.png cr48-device-memory.png cr64-action-player_playlist.png cr32-mime-metafont.png cr48-action-wizard.png cr16-action-exec.png cr22-mime-exec_wine.png cr16-action-forward.png cr32-action-window_nofullscreen.png cr32-action-text_under.png cr128-mime-source_php.png cr32-action-queue.png cr32-mime-rpm.png cr48-action-mail_new.png crsc-mime-quicktime.svgz cr48-filesys-folder_red.png cr16-action-player_start.png cr22-action-bookmarks_list_add.png cr16-action-misc.png cr22-mime-make.png cr22-action-color_line.png crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr64-device-blockdevice.png cr128-mime-font_truetype.png cr48-mime-shellscript.png cr128-filesys-trashcan_full.png cr22-device-camera_unmount.png cr64-device-sd_mmc_mount.png cr16-action-signature.png cr16-action-math_lsup.png cr32-action-redo.png cr32-action-filefind.png cr128-action-contents2.png cr48-device-smart_media_unmount.png cr64-device-pda_black.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr16-action-kde6.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr16-action-halfencrypted.png cr22-mime-source_y.png cr32-device-smart_media_unmount.png cr32-action-mouse.png crsc-filesys-exec_wine.svgz cr32-mime-postscript.png cr32-device-memory.png cr22-mime-kivio_flw.png cr22-action-math_matrix.png cr16-action-bookmark_toolbar.png cr48-mime-cdimage.png cr128-mime-deb.png crsc-mime-exec_wine.svgz cr32-action-save_all.png cr16-mime-source_o.png cr16-filesys-server.png cr22-action-mail_post_to.png cr16-filesys-folder_green_open.png cr48-mime-rpm.png cr16-action-music_halfnote.png cr22-action-start.png cr48-mime-source_h.png cr32-device-pda_blue.png cr16-device-blockdevice.png cr16-mime-source_cpp.png cr48-mime-spreadsheet.png cr32-action-contents.png cr32-filesys-folder_yellow.png cr48-device-print_class.png cr16-action-text_bold.png cr128-device-smart_media_unmount.png cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png cr16-device-mo_mount.png cr22-action-player_end.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr32-filesys-folder_yellow_open.png cr32-action-bookmark_toolbar.png cr16-mime-message.png crsc-filesys-folder_yellow.svgz cr64-device-cdaudio_unmount.png cr48-device-pda_blue.png cr64-mime-pdf.png cr16-action-math_frac.png cr32-action-bookmark_add.png crsc-device-tv.svgz cr22-filesys-trashcan_empty.png cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am cr16-filesys-folder_sent_mail.png cr48-filesys-ftp.png cr128-mime-source_l.png cr128-filesys-zip.png cr16-action-up.png cr64-mime-soffice.png cr32-action-editcut.png cr16-filesys-folder_green.png cr22-action-math_sqrt.png cr32-mime-man.png cr16-action-undo.png cr22-action-news_unsubscribe.png cr16-action-frameprint.png cr22-action-editclear.png crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png cr32-action-gear.png cr22-action-mail_send.png cr22-action-stop.png cr22-mime-recycled.png cr64-mime-vectorgfx.png cr22-action-viewmag-.png cr16-action-view_detailed.png cr16-device-camera_mount.png crsc-filesys-network.svgz cr32-action-music_natur.png cr22-action-frame_spreadsheet.png cr48-filesys-folder_open.png cr32-action-button_ok.png cr32-action-attach.png cr32-action-exec.png crsc-mime-netscape_doc.svgz cr22-mime-txt2.png cr22-action-redo.png cr64-filesys-folder_violet.png cr64-mime-source_o.png cr16-filesys-folder_red_open.png cr16-action-view_text.png cr22-action-filesave.png cr48-mime-misc.png cr22-action-mail_forward.png cr64-mime-binary.png crsc-mime-html.svgz cr16-action-kde3.png cr16-device-compact_flash_mount.png cr22-action-revert.png cr32-action-compfile.png cr128-filesys-folder_home.png cr128-mime-info.png cr48-mime-exec_wine.png cr16-action-identity.png cr32-mime-source_y.png cr16-action-rotate_ccw.png cr22-action-connect_no.png cr32-device-nfs_unmount.png cr32-filesys-ftp.png cr32-action-encrypted.png cr32-action-player_start.png cr48-filesys-network.png cr32-action-mail_delete.png cr22-device-usbpendrive_unmount.png cr16-filesys-folder_violet.png cr22-action-toggle_log.png cr22-action-math_onetwomatrix.png cr64-mime-message.png crsc-mime-document.svgz cr16-action-decrypted.png cr22-action-identity.png cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr32-mime-kword_kwd.png cr22-action-math_brackets.png cr16-mime-ascii.png cr22-action-math_sum.png cr32-action-start.png cr32-device-tv.png cr128-mime-font_bitmap.png cr16-action-edit.png cr16-action-2uparrow.png cr16-filesys-folder_red.png cr16-mime-netscape_doc.png cr32-action-music_halfnote.png cr32-action-mail_get.png crsc-filesys-folder_tar.svgz cr128-mime-document.png cr16-action-view_top_bottom.png cr64-device-3floppy_mount.png cr22-mime-ascii.png crsc-mime-source_j.svgz Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png cr32-filesys-lockoverlay.png cr22-filesys-folder_open.png crsc-mime-source_pl.svgz cr64-filesys-www.png crsc-filesys-lockoverlay.svgz crsc-mime-vcalendar.svgz cr22-device-joystick.png cr16-action-run.png cr128-mime-colorscm.png cr32-action-filter.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr128-device-sd_mmc_unmount.png cr48-mime-tar.png cr32-filesys-exec.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr22-device-usbpendrive_mount.png cr48-mime-widget_doc.png cr16-action-unlock.png crsc-filesys-home_blue.svgz cr32-mime-log.png cr16-mime-vcalendar.png cr16-action-1downarrow.png cr22-action-filter.png cr128-mime-rpm.png cr128-filesys-folder_green.png cr32-filesys-folder_orange_open.png cr128-mime-binary.png cr22-action-charset.png cr16-filesys-folder_man.png cr22-action-text_super.png cr32-action-folder_new.png cr16-action-stamp.png cr16-action-mail_find.png cr128-mime-message.png cr22-action-today.png cr64-mime-kugar_kud.png cr16-action-bottom.png cr22-action-button_ok.png cr32-filesys-folder_tar.png cr64-mime-font.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr22-action-window_nofullscreen.png cr48-mime-readme.png cr16-mime-source_moc.png cr16-device-cdrom_mount.png cr16-device-cdaudio_unmount.png cr64-mime-postscript.png cr16-device-smart_media_mount.png cr16-action-pencil.png cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png crsc-action-contents2.svgz cr32-filesys-folder_sound.png cr22-action-math_int.png cr128-filesys-folder_violet.png cr64-device-hdd_unmount.png cr64-mime-source_l.png cr32-mime-readme.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr128-mime-gf.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-source_p.png cr16-filesys-folder_print.png crsc-device-zip_mount.svgz cr16-action-mail_post_to.png cr32-mime-pk.png cr64-mime-source_p.png cr16-device-system.png crsc-mime-pdf.svgz cr16-mime-source_f.png cr32-mime-kivio_flw.png cr22-filesys-folder_violet_open.png cr32-device-tablet.png cr22-action-editshred.png cr16-action-1leftarrow.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.png cr16-device-zip_mount.png cr128-mime-spreadsheet.png cr22-action-edittrash.png cr32-action-unindent.png cr128-filesys-folder_sound.png cr32-mime-source_moc.png cr128-action-fileprint.png cr64-mime-kword_kwd.png cr16-action-text_under.png cr16-mime-font_bitmap.png cr32-action-music_32ndnote.png cr16-mime-pdf.png cr22-mime-encrypted.png cr16-device-mouse.png crsc-filesys-zip.svgz cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr32-mime-unknown.png cr22-action-next.png cr22-action-fileclose.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-postscript.png cr48-mime-koffice.png cr16-action-stop.png cr16-action-fontsizedown.png cr16-action-player_rew.png cr32-action-filenew.png cr48-action-indent.png cr16-action-connect_established.png cr16-action-math_onetwomatrix.png cr16-action-editcut.png cr64-mime-karbon_karbon.png cr64-action-filequickprint.png cr32-mime-font.png cr48-action-down.png cr32-action-unlock.png cr48-filesys-folder_sound.png cr16-device-sd_mmc_mount.png cr32-mime-vcalendar.png cr32-action-back.png cr48-filesys-folder_crystal.png cr16-action-view_left_right.png cr32-action-view_remove.png cr16-action-text_italic.png cr16-mime-document.png cr64-filesys-folder_green.png cr128-filesys-desktop.png cr48-device-pda_black.png cr128-mime-video.png cr22-action-frameprint.png cr22-mime-font_type1.png crsc-device-compact_flash_mount.svgz cr22-action-viewmag+.png cr16-mime-html.png cr32-mime-txt.png cr32-filesys-folder_violet.png cr32-action-mail_replyall.png cr32-filesys-folder_image.png cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.png crsc-action-mail_generic.svgz cr22-action-clear_left.png cr16-action-music_flat.png cr22-mime-font_truetype.png cr48-device-camera_mount.png cr22-action-frame_image.png cr16-action-thumbnail.png cr32-mime-soffice.png cr48-device-system.png cr22-action-idea.png cr48-mime-font_bitmap.png cr32-mime-vectorgfx.png cr48-filesys-trashcan_full.png cr48-mime-dvi.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.png cr16-action-player_playlist.png cr32-mime-core.png cr32-mime-source_cpp.png cr16-filesys-folder_open.png crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.png cr16-action-next.png cr16-mime-image.png cr48-mime-recycled.png cr16-action-mail_new.png cr16-action-openterm.png cr64-mime-kpresenter_kpr.png cr32-mime-document2.png cr64-device-usbpendrive_mount.png cr22-mime-binary.png cr48-filesys-zip.png cr32-filesys-folder_man.png cr16-action-colorize.png crsc-mime-tex.svgz cr22-mime-tex.png cr16-action-bookmark_add.png cr16-mime-recycled.png cr32-action-find.png cr128-mime-kmultiple.png cr32-filesys-link.png cr22-mime-font.png crsc-mime-postscript.svgz crsc-mime-core.svgz cr16-action-viewmagfit.png cr64-mime-kspread_ksp.png cr64-device-pda_blue.png cr16-device-camera_unmount.png crsc-device-sd_mmc_unmount.svgz cr22-mime-kspread_ksp.png cr32-action-spellcheck.png cr22-action-fileopen.png cr32-action-music_quarternote.png cr128-filesys-trashcan_empty.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr64-mime-source_cpp.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-device-hdd_mount.png cr128-mime-core.png cr64-device-5floppy_mount.png cr64-filesys-trashcan_empty.png cr64-mime-info.png cr64-device-mo_unmount.png cr22-action-editpaste.png cr22-action-folder.png cr32-action-text_italic.png cr64-device-smart_media_unmount.png cr22-action-locationbar_erase.png cr16-action-project_open.png cr16-action-bookmark_folder.png cr128-filesys-folder_red_open.png cr32-mime-image.png crsc-mime-mozilla_doc.svgz cr32-device-camera_unmount.png cr32-mime-netscape_doc.png cr22-action-1uparrow.png cr32-mime-cdtrack.png cr22-action-undo.png cr32-action-rebuild.png cr48-filesys-folder_yellow_open.png cr22-action-down.png cr22-action-news_subscribe.png cr32-filesys-folder_red.png cr32-mime-source_h.png cr48-mime-source_java.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr128-mime-txt2.png cr16-action-transform.png cr16-action-viewmag-.png cr32-mime-applix.png cr32-action-reload_page.png cr16-device-dvd_unmount.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png cr16-action-completion.png crsc-mime-gf.svgz cr64-device-tablet.png cr22-device-3floppy_unmount.png cr64-mime-txt.png cr16-device-memory.png cr32-action-viewmag+.png cr48-mime-font_type1.png cr48-device-printer1.png cr16-mime-kugar_kud.png cr16-filesys-pipe.png crsc-action-text_under.svgz cr32-action-undo.png cr16-mime-zip.png cr32-filesys-folder_print.png cr48-mime-empty.png cr22-action-view_sidetree.png cr22-mime-metafont.png cr32-action-messagebox_warning.png cr22-action-2uparrow.png cr16-action-player_fwd.png cr32-action-openterm.png cr22-action-openterm.png crsc-mime-font_truetype.svgz cr128-mime-man.png cr16-action-configure_toolbars.png cr32-device-dvd_mount.png cr32-mime-sound.png cr22-action-kde.png cr64-mime-metafont.png cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr128-mime-sound.png cr22-action-math_prod.png cr128-device-memory_stick_unmount.png cr22-action-editcut.png crsc-filesys-folder_open.svgz cr48-mime-tgz.png cr22-action-music_cleficon.png crsc-filesys-www.svgz cr32-action-editclear.png cr22-mime-source_cpp.png cr48-mime-wordprocessing.png cr64-mime-font_bitmap.png cr22-action-view_tree.png cr22-action-share.png cr48-mime-source_py.png cr64-filesys-folder_man.png cr22-action-1leftarrow.png cr128-device-camera_mount.png cr64-action-contents2.png cr32-filesys-folder_txt.png cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.png cr16-mime-tex.png cr48-device-nfs_unmount.png cr22-mime-colorscm.png cr64-filesys-folder_image.png cr32-mime-quicktime.png cr16-mime-unknown.png cr32-device-smart_media_mount.png cr16-mime-applix.png cr128-mime-mozilla_doc.png cr32-mime-source_py.png cr128-mime-vectorgfx.png cr16-mime-gf.png crsc-device-cdwriter_mount.svgz cr22-action-attach.png cr16-action-text_right.png cr16-action-contents2.png cr16-device-smart_media_unmount.png cr22-filesys-folder_home.png cr22-mime-source.png cr48-device-5floppy_mount.png cr22-action-math_paren.png cr64-device-dvd_unmount.png crsc-filesys-services.svgz cr64-mime-kchart_chrt.png cr16-action-math_matrix.png cr48-device-cdaudio_mount.png cr16-device-hdd_unmount.png cr32-action-math_frac.png cr16-action-compfile.png cr32-mime-kmultiple.png cr128-device-blockdevice.png cr48-device-compact_flash_unmount.png 
++KDE_DIST=cr32-device-system.png cr32-device-usbpendrive_unmount.png cr16-action-history.png cr16-action-math_lsub.png cr32-action-fileprint.png cr32-mime-template_source.png crsc-filesys-folder_favorite.svgz crsc-mime-zip.svgz cr16-action-about_kde.png cr32-action-mail_post_to.png cr16-mime-tar.png cr16-filesys-lockoverlay.png cr64-filesys-lockoverlay.png cr64-mime-exec_wine.png cr16-device-hdd_mount.png cr64-mime-source_y.png cr48-device-cdrom_mount.png cr22-action-player_eject.png cr32-mime-exec_wine.png cr22-mime-tgz.png cr32-action-text_block.png crsc-device-zip_unmount.svgz cr32-action-messagebox_critical.png cr32-device-mo_unmount.png cr16-device-tv.png cr48-mime-info.png cr16-filesys-link.png cr32-action-player_eject.png cr64-mime-shellscript.png cr22-mime-soffice.png cr16-device-printer1.png cr22-action-math_brace.png cr32-filesys-file_broken.png crsc-mime-video.svgz cr22-action-window_new.png cr16-action-move.png cr128-mime-misc.png cr64-action-frameprint.png cr32-action-leftjust.png cr16-action-music_32ndnote.png cr16-action-2rightarrow.png cr64-mime-html.png cr16-action-help.png crsc-device-print_class.svgz cr48-mime-html.png cr22-action-connect_creating.png cr64-filesys-network.png cr16-action-editclear.png crsc-filesys-home_white.svgz cr16-device-3floppy_mount.png cr16-filesys-folder_grey.png cr16-filesys-folder_important.png cr22-action-music_quarternote.png cr64-device-smart_media_mount.png cr32-device-cdwriter_unmount.png cr48-mime-source_o.png crsc-filesys-folder_locked.svgz cr64-mime-cdr.png cr48-mime-encrypted.png cr48-action-frameprint.png cr32-mime-make.png cr22-action-thumbnail.png cr128-filesys-folder_yellow.png crsc-mime-source.svgz cr16-action-news_subscribe.png cr22-device-memory_stick_unmount.png cr48-action-share.png crsc-mime-cdtrack.svgz cr22-filesys-folder_grey.png cr16-mime-postscript.png cr64-filesys-zip.png cr32-filesys-desktop.png cr32-mime-pdf.png cr16-action-text.png cr48-filesys-link.png cr22-mime-source_o.png cr16-mime-news.png cr128-mime-source_h.png crsc-filesys-folder_green.svgz cr16-action-filefind.png crsc-action-fileprint.svgz cr22-action-mail_find.png cr32-action-next.png cr64-mime-video.png cr16-action-save_all.png cr64-mime-gf.png cr128-mime-metafont.png cr48-mime-txt.png cr48-device-3floppy_mount.png cr16-device-pda_black.png cr48-filesys-folder_violet.png cr128-mime-source.png cr22-device-cdaudio_unmount.png cr22-mime-empty.png cr22-mime-info.png cr32-action-bookmark_folder.png cr64-mime-cdtrack.png crsc-mime-image2.svgz cr22-action-mail_new3.png cr128-mime-source_f.png cr16-mime-misc.png cr16-action-player_play.png cr22-action-mail_delete.png cr32-action-view_top_bottom.png cr22-action-button_cancel.png cr22-mime-kformula_kfo.png cr32-action-share.png cr32-mime-gf.png cr16-action-window_nofullscreen.png cr16-filesys-folder_html.png cr64-device-nfs_unmount.png cr16-action-fileopen.png cr16-action-player_end.png cr64-mime-source_php.png cr48-mime-source_moc.png cr128-app-password.png cr22-action-make_kdevelop.png cr22-action-encrypted.png cr48-device-tablet.png cr16-action-filesaveas.png cr48-device-mo_mount.png crsc-mime-source_o.svgz cr64-action-player_play.png cr48-filesys-file_broken.png cr48-action-back.png cr32-device-memory_stick_unmount.png cr32-action-view_left_right.png cr16-mime-pk.png cr128-mime-cdimage.png cr48-action-filequickprint.png cr64-device-cdaudio_mount.png cr128-mime-pdf.png cr16-action-text_center.png cr22-action-pencil.png cr32-mime-tar.png cr64-mime-misc.png crsc-device-hdd_unmount.svgz cr128-mime-font.png cr16-action-eraser.png cr22-action-filenew.png cr16-action-view_remove.png cr32-action-music_sixteenthnote.png cr16-action-fileprint.png cr22-mime-document2.png cr32-action-music_dottednote.png cr64-mime-source_pl.png cr128-mime-make.png cr48-device-usbpendrive_mount.png cr32-action-music_fermatenote.png crsc-device-scanner.svgz cr16-action-flag.png cr22-action-rotate_ccw.png cr16-action-text_strike.png cr22-action-text_right.png cr22-action-blend.png cr32-mime-widget_doc.png crsc-mime-karbon_karbon.svgz cr22-action-lock.png cr22-mime-zip.png cr128-mime-source_cpp.png cr22-action-music_halfnote.png cr16-action-lock.png cr64-mime-dvi.png cr32-mime-html.png crsc-device-nfs_mount.svgz cr16-action-remove.png cr22-action-view_choose.png cr22-action-translate.png cr64-mime-man.png cr32-action-down.png cr22-mime-source_j.png cr16-action-blend.png cr48-filesys-folder_print.png cr22-mime-image.png cr22-mime-krita_kra.png crsc-filesys-network_local.svgz cr48-mime-gettext.png cr32-action-bookmark.png crsc-action-text_bild.svgz crsc-filesys-folder_blue.svgz cr16-action-music_eightnote.png cr22-action-edit.png cr22-action-project_open.png cr48-filesys-folder_yellow.png cr64-mime-txt2.png cr128-mime-wordprocessing.png cr16-filesys-folder_locked.png crsc-mime-ascii.svgz cr48-device-sd_mmc_mount.png cr128-mime-readme.png cr22-action-music_dottednote.png cr16-device-nfs_mount.png cr22-filesys-folder_orange_open.png cr16-filesys-folder_yellow.png cr22-mime-kword_kwd.png crsc-mime-source_s.svgz cr32-mime-txt2.png cr22-action-mail_reply.png cr32-device-usbpendrive_mount.png cr16-mime-core.png cr128-mime-resource.png cr16-filesys-folder_orange_open.png cr32-action-stop.png cr128-mime-pk.png cr16-mime-kword_kwd.png cr22-action-queue.png cr16-action-exit.png cr16-action-viewmag+.png cr32-device-blockdevice.png cr48-mime-man.png cr64-mime-source.png cr22-mime-kpresenter_kpr.png crsc-mime-dvi.svgz cr32-device-nfs_mount.png cr16-action-revert.png cr22-mime-source_l.png cr22-action-view_left_right.png cr32-action-exit.png crsc-mime-pk.svgz cr22-action-up.png cr16-action-share.png cr16-mime-source_php.png cr32-mime-font_type1.png cr16-action-translate.png cr16-device-memory_stick_unmount.png cr64-mime-deb.png cr32-action-music_cross.png cr16-action-finish.png cr128-device-compact_flash_unmount.png cr64-mime-kmultiple.png cr16-action-text_left.png cr64-filesys-desktop.png cr16-action-reload.png cr16-mime-rpm.png cr64-mime-readme.png cr16-filesys-folder.png cr22-mime-rpm.png cr64-device-zip_mount.png cr32-mime-document.png cr32-mime-video.png cr128-filesys-folder_home2.png cr16-device-cdwriter_unmount.png cr22-action-halfencrypted.png cr48-filesys-www.png cr16-mime-exec_wine.png crsc-device-pda_black.svgz cr64-mime-kformula_kfo.png cr16-action-view_multicolumn.png cr32-action-bookmarks_list_add.png cr16-action-reload_page.png cr128-mime-exec_wine.png cr32-action-centrejust.png cr16-action-spellcheck.png cr32-device-sd_mmc_unmount.png crsc-action-text_super.svgz cr48-device-smart_media_mount.png crsc-action-frameprint.svgz cr16-mime-kformula_kfo.png cr22-mime-source_py.png cr48-mime-source_c.png cr32-device-cdrom_unmount.png cr22-mime-dvi.png cr16-action-music_fermatenote.png cr16-action-emptytrash.png cr32-action-fonts.png cr16-action-fill.png cr64-mime-unknown.png cr22-action-viewmag1.png cr32-mime-kpresenter_kpr.png cr16-mime-metafont.png crsc-device-mouse.svgz cr128-action-filequickprint.png cr32-action-blend.png cr16-action-music_sixteenthnote.png cr22-mime-source_p.png crsc-action-text_bold.svg cr128-filesys-folder_red.png cr48-action-gear.png cr22-action-player_rew.png crsc-mime-vectorgfx.svgz cr64-app-password.png cr48-mime-ascii.png index.theme cr22-mime-kchart_chrt.png cr16-filesys-file_broken.png crsc-filesys-folder_yellow_open.svgz cr64-filesys-folder_important.png crsc-mime-shellscript.svgz cr16-action-charset.png cr22-filesys-folder_grey_open.png crsc-mime-source_php.svgz cr128-device-chardevice.png cr64-mime-source_c.png cr32-action-math_lsub.png crsc-mime-vcard.svgz cr16-action-music_quarternote.png cr64-mime-font_type1.png crsc-mime-font_bitmap.svgz crsc-filesys-folder_violet_open.svgz cr22-action-player_fwd.png cr16-device-memory_stick_mount.png cr16-action-edittrash.png cr16-action-rotate.png cr16-action-connect_no.png cr22-action-about_kde.png cr16-action-frame_query.png cr16-action-math_rsub.png cr48-action-unindent.png cr16-mime-info.png crsc-filesys-link.svgz cr48-action-fileclose.png cr128-mime-tex.png cr22-action-music_sixteenthnote.png cr22-mime-gf.png cr16-filesys-folder_home2.png crsc-filesys-folder_html.svgz cr22-filesys-folder_green_open.png cr32-mime-kugar_kud.png cr32-action-math_paren.png cr32-mime-source.png cr32-action-math_rsub.png cr128-mime-source_j.png cr128-filesys-exec.png cr128-mime-source_y.png cr48-device-dvd_unmount.png cr16-mime-deb.png crsc-filesys-folder_txt.svgz cr32-filesys-folder_green.png cr22-action-connect_established.png crsc-filesys-file_important.svgz crsc-filesys-folder_red_open.svgz cr22-action-frame_text.png cr48-mime-karbon_karbon.png cr16-action-back.png crsc-mime-tgz.svgz cr128-filesys-folder_txt.png crsc-mime-log.svgz cr32-mime-kspread_ksp.png cr22-action-decrypted.png cr16-action-viewmag1.png crsc-action-text_strike.svgz cr22-mime-news.png cr22-action-wizard.png cr32-action-player_pause.png cr16-mime-tgz.png cr16-filesys-network.png cr32-action-mail_generic.png cr22-action-view_icon.png cr16-filesys-www.png cr22-filesys-folder_yellow.png cr16-action-math_sum.png crsc-action-info.svgz cr48-filesys-desktop.png cr48-mime-tex.png cr32-action-rotate_cw.png cr16-action-editcopy.png cr32-device-hdd_unmount.png cr32-action-mail_replylist.png cr22-action-music_eightnote.png crsc-mime-file_temporary.svgz cr64-mime-font_truetype.png cr22-mime-readme.png cr32-action-gohome.png cr16-mime-source_py.png cr48-mime-source_cpp.png cr22-action-view_top_bottom.png cr22-mime-cdimage.png cr16-mime-cdimage.png cr64-filesys-folder_home2.png cr16-action-previous.png cr16-device-cdwriter_mount.png cr32-device-scanner.png cr32-mime-kexi_kexi.png cr16-action-view_icon.png cr22-action-top.png cr32-action-emptytrash.png cr16-device-mo_unmount.png cr22-action-signature.png cr22-action-player_start.png cr32-device-3floppy_unmount.png cr32-filesys-zip.png cr32-action-filesaveas.png cr32-mime-gettext.png cr16-device-nfs_unmount.png cr22-device-hdd_mount.png cr32-action-player_play.png cr16-action-color_fill.png cr32-device-cdrom_mount.png cr22-action-frame_edit.png cr16-filesys-ftp.png cr128-mime-txt.png cr64-mime-recycled.png crsc-device-usbpendrive_mount.svgz cr32-filesys-trashcan_full.png cr32-action-player_playlist.png cr22-mime-spreadsheet.png cr22-action-music_32ndnote.png cr22-action-centrejust.png cr48-filesys-folder_html.png cr32-action-editcopy.png crsc-mime-font.svgz cr128-mime-tar.png cr64-mime-pk.png cr16-action-rotate_cw.png crsc-device-memory.svgz cr16-filesys-folder_favorite.png cr22-action-reload_page.png cr22-action-window_fullscreen.png cr16-action-configure.png cr128-mime-vcalendar.png cr32-action-contexthelp.png cr22-action-configure.png cr22-mime-vcalendar.png cr16-action-math_brace.png cr16-filesys-folder_image.png crsc-mime-source_f.svgz cr22-device-memory_stick_mount.png cr128-mime-encrypted.png cr32-action-viewmag1.png cr16-action-view_sidetree.png crsc-action-filequickprint.svgz cr32-mime-spreadsheet.png cr16-device-chardevice.png cr16-mime-source_c.png cr32-action-viewmag-.png cr128-mime-cdtrack.png cr16-mime-binary.png cr16-mime-txt2.png cr16-mime-kchart_chrt.png crsc-filesys-folder_red.svgz cr64-mime-cdimage.png cr22-action-leftjust.png crsc-filesys-exec.svgz cr32-action-window_fullscreen.png cr48-mime-source_l.png cr16-filesys-folder_violet_open.png cr32-action-mail_new.png cr48-device-sd_mmc_unmount.png cr128-filesys-folder_orange.png cr48-mime-midi.png cr64-device-cdwriter_mount.png cr32-mime-kformula_kfo.png cr48-mime-font.png cr64-device-system.png cr16-mime-font.png crsc-device-smartmedia_mount.svgz cr22-action-view_right.png cr64-mime-document.png cr128-filesys-folder_grey_open.png cr128-mime-tgz.png cr22-mime-document.png cr32-action-text_right.png cr32-action-music_cleficon.png cr16-action-reload_all_tabs.png cr48-device-usbpendrive_unmount.png cr64-filesys-folder_green_open.png cr48-mime-image.png cr32-action-connect_creating.png cr22-action-player_stop.png cr22-filesys-folder_red_open.png crsc-mime-koffice.svgz cr64-mime-colorscm.png cr48-filesys-folder_locked.png cr48-filesys-folder_image.png cr48-action-identity.png cr128-mime-kexi_kexi.png cr64-mime-koffice.png cr22-action-view_multicolumn.png cr22-mime-log.png cr32-filesys-folder_home.png cr22-mime-core.png cr16-action-find.png cr22-device-sd_mmc_unmount.png cr16-action-math_prod.png cr32-action-wizard.png cr32-action-mail_reply.png cr64-device-mouse.png cr16-mime-source_h.png cr22-action-run.png cr128-filesys-folder_tar.png cr32-mime-wordprocessing.png crsc-device-mo_unmount.svgz cr16-mime-video.png cr32-action-kdevelop_down.png cr22-action-fontsizedown.png cr128-filesys-network.png crsc-device-compact_flash_unmount.svgz cr32-action-view_bottom.png cr32-action-mail_find.png crsc-mime-message.svgz cr16-action-math_brackets.png cr22-mime-file_temporary.png cr48-action-bookmark.png cr48-filesys-folder_green_open.png cr22-action-move.png cr48-mime-soffice.png cr16-action-no.png cr22-device-sd_mmc_mount.png cr16-action-frame_edit.png cr16-action-filenew.png cr22-action-contexthelp.png cr48-mime-video.png cr16-action-make_kdevelop.png cr22-action-message_reply.png cr16-action-fork.png cr128-mime-postscript.png cr16-app-password.png cr22-mime-deb.png cr32-action-about_kde.png cr16-action-connect_creating.png crsc-mime-man.svgz cr16-action-window_new.png crsc-action-about_kde.svgz cr22-filesys-www.png cr32-action-text_strike.png cr22-device-printer1.png cr48-filesys-network_local.png cr64-mime-kivio_flw.png cr48-filesys-exec.png cr48-filesys-folder_important.png cr128-mime-karbon_karbon.png cr32-action-math_prod.png cr48-mime-kword_kwd.png cr16-action-attach.png cr128-mime-netscape_doc.png cr22-action-text_italic.png crsc-mime-kmultiple.svgz cr32-action-math_int.png cr128-mime-empty.png cr128-mime-recycled.png cr64-device-dvd_mount.png cr22-action-mail_new.png cr32-mime-cdr.png cr22-device-compact_flash_unmount.png cr32-mime-krita_kra.png cr128-device-memory_stick_mount.png cr16-filesys-folder_grey_open.png cr32-action-view_sidetree.png cr16-action-fileexport.png cr32-action-rotate.png cr32-action-editpaste.png cr64-filesys-folder_orange_open.png cr64-filesys-folder_grey.png cr48-mime-kexi_kexi.png cr32-action-player_stop.png cr32-filesys-www.png crsc-filesys-folder_blue_open.svgz cr48-device-nfs_mount.png cr16-action-mail_replylist.png cr32-action-math_onetwomatrix.png cr16-action-airbrush.png cr22-action-colorpicker.png cr48-device-joystick.png cr16-mime-source_y.png crsc-filesys-file_broken.svgz cr22-action-math_rsup.png cr48-mime-source.png cr22-action-rotate_cw.png cr48-filesys-trashcan_empty.png cr32-action-connect_no.png cr16-action-text_block.png cr64-device-compact_flash_unmount.png crsc-mime-cdimage.svgz cr48-mime-document2.png cr22-action-math_abs.png cr32-device-camera_mount.png cr32-action-make_kdevelop.png cr128-filesys-network_local.png cr16-mime-readme.png cr48-filesys-folder_tar.png cr16-filesys-folder_video.png cr32-mime-source_s.png cr64-filesys-folder_txt.png crsc-mime-make.svgz cr22-action-showmenu.png cr22-action-filequickprint.png cr32-filesys-folder_grey.png crsc-mime-empty.svgz cr16-device-dvd_mount.png cr32-device-zip_unmount.png cr64-mime-resource.png cr32-device-sd_mmc_mount.png crsc-mime-applix.svgz cr16-filesys-zip.png cr16-action-text_sub.png cr16-action-window_suppressed.png cr64-mime-log.png cr22-action-color_fill.png cr48-filesys-folder_green.png cr48-filesys-folder_violet_open.png cr22-action-math_frac.png cr32-filesys-folder_favorite.png cr64-filesys-folder_print.png cr32-mime-source_o.png cr16-action-music_fullnote.png cr128-filesys-folder_video.png cr22-mime-midi.png cr32-action-fileimport.png cr64-mime-core.png cr32-action-colorize.png cr64-filesys-folder_locked.png cr22-action-filefind.png cr64-device-hdd_mount.png cr32-action-view_tree.png cr128-action-share.png cr32-action-today.png cr64-filesys-folder_video.png cr32-mime-file_temporary.png svgz-action-text_italic.svgz cr32-filesys-folder_grey_open.png cr48-device-scanner.png cr128-mime-dvi.png cr32-action-math_matrix.png cr16-device-compact_flash_unmount.png cr64-filesys-exec.png cr128-device-hdd_unmount.png cr16-action-math_int.png cr32-device-dvd_unmount.png cr16-action-math_sqrt.png crsc-action-configure.svgz cr48-mime-source_f.png crsc-filesys-desktop.svgz cr32-device-compact_flash_unmount.png cr128-mime-document2.png cr32-action-indent.png crsc-mime-recycled.svgz cr16-action-bookmark.png cr32-device-cdwriter_mount.png cr32-mime-source_l.png cr48-mime-zip.png cr22-filesys-desktop.png cr32-action-top.png cr16-action-kde5.png cr48-device-cdwriter_unmount.png cr32-filesys-folder_green_open.png cr48-action-exit.png cr22-action-frame_chart.png cr16-device-usbpendrive_unmount.png cr128-filesys-folder_favorite.png cr16-action-contents.png cr22-mime-koffice.png cr16-action-frame_spreadsheet.png cr128-mime-template_source.png cr32-mime-dvi.png cr128-filesys-www.png crsc-device-blockdevice.svgz cr22-action-reload3.png cr22-action-goto.png crsc-mime-image.svgz cr16-action-math_abs.png cr22-device-compact_flash_mount.png cr32-device-5floppy_mount.png cr48-device-blockdevice.png cr48-mime-kmultiple.png crsc-filesys-folder_man2.svgz cr16-action-tab_remove.png cr48-mime-kugar_kud.png cr22-action-mouse.png cr22-mime-source_java.png crsc-mime-source_java.svgz crsc-device-sd_mmc_mount.svgz cr32-filesys-folder_red_open.png cr22-mime-postscript.png cr16-device-tablet.png cr48-mime-template_source.png cr32-action-player_end.png crsc-mime-source_p.svgz crsc-filesys-folder_orange_open.svgz cr32-action-text_left.png cr22-action-view_remove.png cr32-action-math_brackets.png cr22-action-spellcheck.png cr32-mime-binary.png cr16-filesys-desktop.png cr32-mime-cdimage.png cr22-mime-video.png cr22-device-system.png cr16-action-tab_new.png cr64-filesys-folder_orange.png crsc-action-mail_post_to.svgz cr64-filesys-folder_yellow.png cr32-action-finish.png cr16-action-1uparrow.png cr32-mime-karbon_karbon.png cr32-filesys-folder_locked.png cr22-action-airbrush.png cr32-action-viewmagfit.png crsc-mime-sound.svgz crsc-filesys-folder_cyan.svgz cr16-mime-log.png cr32-device-printer1.png crsc-filesys-folder_sound.svgz cr128-filesys-file_broken.png cr16-action-wizard.png cr16-action-math_rsup.png cr32-device-pda_black.png cr48-mime-source_pl.png cr32-action-viewmag.png crsc-mime-rpm.svgz crsc-device-cdwriter_unmount.svgz cr22-filesys-folder_print.png cr32-mime-vcard.png cr48-device-chardevice.png cr48-mime-source_s.png crsc-action-exit.svgz cr64-device-nfs_mount.png crsc-device-dvd_unmount.svgz cr64-mime-source_moc.png cr32-action-clear_left.png cr22-action-text_block.png cr48-mime-krita_kra.png cr48-device-mouse.png crsc-mime-source_l.svgz cr128-mime-source_s.png cr16-mime-source_java.png crsc-mime-txt2.svgz cr16-action-services.png cr64-device-mo_mount.png cr22-action-mail_replylist.png cr64-filesys-folder_html.png crsc-action-text_sub.svgz cr32-action-player_fwd.png cr64-mime-source_h.png cr22-mime-source_s.png cr64-filesys-network_local.png cr48-mime-log.png cr22-action-rebuild.png cr48-action-lock.png cr32-device-print_class.png cr32-action-edittrash.png cr22-action-unlock.png cr22-action-save_all.png cr16-device-print_class.png crsc-mime-source_c.svgz cr22-filesys-folder.png crsc-device-dvd_mount.svgz cr16-filesys-folder_inbox.png cr48-mime-cdtrack.png cr16-action-view_right.png cr16-action-frame_image.png cr64-device-camera_unmount.png cr32-filesys-folder.png cr16-action-redo.png crsc-device-mo_umount.svgz cr16-filesys-folder_outbox.png cr32-device-joystick.png cr22-action-fill.png cr16-action-cancel.png cr22-action-key_enter.png cr32-device-3floppy_mount.png cr32-mime-source_j.png cr32-action-math_lsup.png cr64-mime-quicktime.png cr16-mime-source_pl.png cr22-mime-wordprocessing.png cr16-device-usbpendrive_mount.png cr32-action-view_icon.png cr128-device-compact_flash_mount.png cr48-filesys-folder.png crsc-device-cdaudio_mount.svgz cr22-action-math_rsub.png cr48-mime-txt2.png cr64-filesys-folder_yellow_open.png cr128-mime-widget_doc.png cr16-action-mail_replyall.png cr128-filesys-folder_yellow_open.png cr16-mime-font_type1.png cr22-device-print_class.png crsc-mime-wordprocessing.svgz cr16-action-fileimport.png cr32-action-connect_established.png cr22-mime-file_locked.png cr128-filesys-folder_orange_open.png cr16-mime-source_s.png cr16-mime-source_l.png crsc-filesys-folder_important.svgz cr22-action-bookmark_folder.png cr22-mime-kexi_kexi.png cr64-mime-source_j.png cr22-mime-source_c.png cr16-filesys-folder_home.png cr32-action-help.png crsc-filesys-file_locked.svgz crsc-device-joystick.svgz crsc-action-filenew.svgz cr128-mime-ascii.png cr22-app-password.png cr128-filesys-folder_important.png cr16-action-mail_send.png cr48-mime-metafont.png crsc-filesys-pipe.svgz cr48-action-filenew.png cr22-action-gear.png cr32-action-music_flat.png cr16-action-music_cross.png crsc-device-hdd_mount.svgz cr64-filesys-folder_tar.png cr128-device-sd_mmc_mount.png cr64-mime-vcalendar.png cr32-action-math_abs.png cr16-mime-vcard.png cr128-filesys-lockoverlay.png cr16-action-kde4.png cr64-device-3floppy_unmount.png cr32-action-view_right.png cr64-mime-vcard.png cr22-action-reload_all_tabs.png cr64-mime-widget_doc.png cr48-mime-resource.png cr32-action-contents2.png cr48-mime-pdf.png cr32-action-view_multicolumn.png cr16-mime-shellscript.png cr16-action-window_fullscreen.png cr48-device-hdd_unmount.png cr32-action-messagebox_info.png cr48-action-up.png cr32-action-math_brace.png cr22-mime-vectorgfx.png cr48-device-dvd_mount.png cr48-mime-kivio_flw.png cr16-action-2leftarrow.png cr48-device-zip_mount.png cr32-action-revert.png cr22-action-player_play.png crsc-filesys-folder_green_open.svgz cr32-mime-recycled.png cr16-filesys-folder_orange.png cr32-action-player_rew.png cr22-action-finish.png cr16-device-sd_mmc_unmount.png cr16-device-scanner.png cr22-action-bookmark.png cr32-mime-source_c.png crsc-mime-source_cpp.svgz cr22-action-exec.png cr64-device-camera_mount.png cr48-filesys-folder_home2.png cr16-action-player_volume.png cr64-device-5floppy_unmount.png cr64-mime-mozilla_doc.png cr16-action-history_clear.png cr22-device-camera_mount.png crsc-device-5floppy_unmount.svgz cr16-action-music_cleficon.png cr48-mime-source_php.png cr16-action-mail_generic.png cr16-action-info.png cr64-mime-rpm.png cr16-mime-midi.png crsc-device-camera_mount.svgz crsc-mime-source_y.svgz cr22-filesys-folder_green.png cr128-filesys-folder_print.png cr16-action-paintbrush.png crsc-action-mail_new.svgz cr22-mime-netscape_doc.png cr32-filesys-network_local.png cr64-mime-make.png cr16-action-goto.png cr32-action-filequickprint.png cr22-filesys-folder_yellow_open.png cr48-action-misc.png cr48-mime-source_p.png crsc-mime-source_h.svgz cr48-device-camera_unmount.png cr16-mime-resource.png cr16-action-editpaste.png cr32-action-misc.png cr22-action-fileexport.png cr16-mime-quicktime.png cr32-mime-deb.png cr64-mime-source_java.png cr48-filesys-folder_home.png cr48-filesys-folder_txt.png cr16-action-mail_get.png cr48-device-compact_flash_mount.png cr16-mime-encrypted.png cr16-mime-kmultiple.png cr48-mime-applix.png cr32-mime-file_locked.png cr48-filesys-folder_outbox.png cr16-mime-cdtrack.png cr32-action-identity.png cr16-action-color_line.png cr16-device-5floppy_unmount.png cr64-filesys-folder_grey_open.png cr48-filesys-folder_orange.png cr128-device-usbpendrive_mount.png crsc-device-memory_stick_mount.svgz cr16-mime-source.png cr16-action-idea.png cr22-action-text_bold.png cr16-device-pda_blue.png cr32-action-text_super.png cr128-action-player_playlist.png crsc-mime-readme.svgz cr128-mime-source_o.png cr64-mime-source_f.png cr32-device-compact_flash_mount.png cr16-device-zip_unmount.png cr22-action-fork.png cr48-filesys-pipe.png cr48-action-forward.png cr128-device-printer1.png cr22-filesys-folder_orange.png cr22-action-emptytrash.png cr64-mime-sound.png cr48-mime-kchart_chrt.png cr32-app-password.png cr128-device-smart_media_mount.png cr128-filesys-folder_violet_open.png cr64-device-printer1.png cr64-filesys-folder_sound.png cr22-action-mail_post_to3.png cr22-action-colorize.png cr16-mime-spreadsheet.png cr16-mime-krita_kra.png cr16-action-view_tree.png crsc-mime-source_py.svgz cr48-filesys-lockoverlay.png crsc-mime-deb.svgz cr22-action-contents.png cr128-filesys-folder_man.png cr32-action-view_detailed.png cr48-device-cdrom_unmount.png cr32-filesys-trashcan_empty.png cr16-action-down.png cr22-action-text_strike.png crsc-action-wizard.svgz cr48-mime-kformula_kfo.png cr16-action-gear.png cr32-device-5floppy_unmount.png crsc-filesys-trashcan_full.svgz cr22-action-mail_replyall.png cr48-filesys-folder_orange_open.png cr32-device-cdaudio_mount.png cr22-mime-message.png cr128-filesys-folder_image.png cr22-action-music_flat.png cr64-device-cdrom_mount.png cr64-mime-applix.png cr48-mime-deb.png cr32-mime-source_java.png cr64-filesys-folder_favorite.png cr22-action-music_natur.png cr128-filesys-folder_locked.png cr22-mime-pdf.png cr128-mime-source_py.png cr32-action-window_new.png cr32-mime-source_pl.png cr64-device-print_class.png crsc-filesys-folder_print.svgz cr128-device-camera_unmount.png cr16-mime-sound.png cr48-action-player_playlist.png cr32-filesys-network.png cr22-filesys-trashcan_full.png cr22-action-2rightarrow.png cr22-action-cd.png cr22-action-fileprint.png cr22-mime-source_pl.png cr64-action-fileprint.png cr64-mime-document2.png cr22-action-music_fullnote.png crsc-action-share.svgz crsc-mime-cdr.svgz cr32-filesys-folder_important.png cr128-mime-krita_kra.png cr16-action-inline_image.png cr16-filesys-network_local.png cr64-filesys-file_broken.png cr64-device-memory_stick_unmount.png cr128-mime-midi.png cr16-action-colorpicker.png cr22-action-previous.png cr22-mime-kugar_kud.png cr16-mime-kpresenter_kpr.png cr16-mime-cdr.png cr32-device-memory_stick_mount.png crsc-filesys-folder_home.svgz cr32-action-view_text.png cr22-mime-txt.png cr16-filesys-folder_tar.png cr48-mime-colorscm.png cr16-device-5floppy_mount.png cr48-action-fileprint.png cr32-action-text_center.png cr48-device-hdd_mount.png cr48-mime-kpresenter_kpr.png cr16-action-tab_breakoff.png cr32-action-mail_send.png cr32-action-mail_forward.png cr16-action-mail_forward.png cr22-action-help.png cr32-action-lock.png cr16-mime-kspread_ksp.png cr64-mime-midi.png cr22-action-exit.png cr16-action-folder_new.png cr64-device-sd_mmc_unmount.png cr16-device-joystick.png cr64-mime-source_s.png cr16-action-ok.png cr32-filesys-folder_open.png cr16-filesys-folder_txt.png cr22-action-apply.png cr48-action-mail_post_to.png cr48-filesys-folder_favorite.png cr48-filesys-folder_grey_open.png cr22-action-text_center.png cr64-mime-empty.png cr22-action-fontsizeup.png cr128-mime-vcard.png cr32-action-button_cancel.png cr32-action-frameprint.png cr16-action-frame_formula.png cr22-mime-karbon_karbon.png cr32-action-previous.png cr48-action-contents2.png cr22-mime-pk.png cr64-device-cdwriter_unmount.png cr48-mime-sound.png cr32-action-math_sum.png cr64-device-compact_flash_mount.png crsc-device-pda_blue.svgz cr22-mime-quicktime.png crsc-mime-widget_doc.svgz cr22-device-hdd_unmount.png cr64-filesys-trashcan_full.png cr64-filesys-folder_violet_open.png crsc-mime-kexi_kexi.svgz cr48-device-tv.png cr128-mime-font_type1.png cr22-action-inline_table.png cr16-action-encrypted.png cr16-action-contexthelp.png cr16-action-editshred.png cr32-mime-source_f.png cr22-action-editdelete.png cr32-device-cdaudio_unmount.png cr64-mime-template_source.png cr32-filesys-folder_html.png crsc-device-3floppy_unmount.svgz cr128-mime-zip.png cr48-device-5floppy_unmount.png cr22-action-eraser.png cr22-mime-vcard.png cr16-mime-widget_doc.png cr128-filesys-pipe.png cr48-app-password.png cr22-action-player_pause.png crsc-mime-font_type1.svgz cr128-filesys-folder_html.png crsc-device-nfs_unmount.svgz cr22-action-contents2.png crsc-mime-soffice.svgz cr22-action-gohome.png cr22-mime-source_h.png cr48-mime-quicktime.png cr16-mime-man.png cr22-action-forward.png cr48-device-cdaudio_unmount.png cr128-mime-applix.png cr22-mime-cdtrack.png cr32-action-forward.png cr22-mime-shellscript.png cr22-action-crop.png cr128-device-system.png cr64-filesys-pipe.png cr22-action-view_text.png cr48-mime-kspread_ksp.png cr16-mime-kivio_flw.png cr16-action-tab_new_raised.png cr16-mime-empty.png cr64-mime-image.png crsc-device-3floppy_mount.svgz cr64-mime-spreadsheet.png cr22-action-1rightarrow.png cr32-filesys-folder_video.png cr22-action-folder_new.png cr64-mime-encrypted.png crsc-mime-tar.svgz cr22-action-bottom.png cr48-mime-document.png crsc-mime-metafont.svgz cr32-action-reload_all_tabs.png cr48-filesys-folder_red_open.png cr64-device-joystick.png crsc-mime-source_moc.svgz cr32-action-fileopen.png cr22-device-smart_media_mount.png cr16-mime-colorscm.png cr22-mime-font_bitmap.png cr16-mime-document2.png cr16-action-editdelete.png cr64-device-usbpendrive_unmount.png cr22-action-history.png cr64-device-memory_stick_mount.png cr32-device-chardevice.png cr16-action-view_bottom.png cr64-filesys-folder_home.png cr16-mime-dvi.png cr32-action-text_bold.png cr128-mime-koffice.png cr16-action-news_unsubscribe.png cr22-action-fileimport.png cr32-action-toggle_log.png cr48-mime-make.png cr128-mime-unknown.png crsc-mime-spreadsheet.svgz cr16-action-player_time.png cr128-mime-quicktime.png cr48-mime-cdr.png cr22-mime-mozilla_doc.png crsc-device-chardevice.svgz cr128-filesys-folder_green_open.png cr32-mime-shellscript.png cr16-mime-vectorgfx.png crsc-filesys-folder.svgz cr16-action-text_super.png cr64-filesys-folder_open.png cr16-action-locationbar_erase.png crsc-device-5floppy_mount.svgz cr16-action-math_paren.png crsc-filesys-folder_grey.svgz cr16-action-fileclose.png crsc-action-lock.svgz cr128-device-mouse.png crsc-filesys-folder_orange.svgz cr32-action-music_fullnote.png cr22-action-math_lsub.png cr22-mime-applix.png cr22-filesys-folder_red.png crsc-mime-unknown.svgz crsc-device-smartmedia_unmount.svgz cr64-device-memory.png cr32-filesys-folder_orange.png cr22-action-back.png cr32-filesys-pipe.png cr48-mime-source_j.png cr128-device-usbpendrive_unmount.png cr32-action-view_choose.png cr32-action-bottom.png cr32-action-rightjust.png cr22-action-view_bottom.png crsc-device-system.svgz cr48-mime-message.png cr32-action-reload.png cr32-mime-font_bitmap.png cr22-action-reload.png cr48-mime-netscape_doc.png cr16-filesys-exec.png cr64-filesys-folder.png cr48-mime-font_truetype.png cr64-device-cdrom_unmount.png cr32-action-charset.png cr32-mime-source_p.png crsc-device-mo_mount.svgz crsc-device-printer1.svgz cr64-device-chardevice.png cr32-mime-source_php.png cr16-filesys-folder_sound.png cr48-mime-gf.png cr16-device-3floppy_unmount.png cr32-action-editdelete.png cr32-mime-misc.png cr48-mime-binary.png cr22-mime-kmultiple.png cr128-action-frameprint.png cr22-action-find.png cr32-mime-empty.png cr16-action-filequickprint.png cr16-filesys-trashcan_empty.png cr128-device-print_class.png cr64-device-tv.png cr32-action-locationbar_erase.png cr16-action-clear_left.png cr16-action-frame_text.png cr32-action-filesave.png cr32-mime-tex.png cr32-filesys-folder_home2.png cr48-mime-vcard.png cr48-mime-pk.png cr16-action-filter.png cr32-mime-font_truetype.png crsc-filesys-folder_violet.svgz cr128-mime-image.png cr32-mime-midi.png cr16-action-viewmag.png cr48-filesys-server.png cr64-mime-krita_kra.png crsc-device-tablet.svgz cr32-filesys-folder_violet_open.png cr32-action-configure.png cr32-action-edit.png cr128-mime-source_c.png cr22-action-view_detailed.png cr22-action-music_fermatenote.png cr32-action-decrypted.png cr128-mime-html.png cr22-action-frame_formula.png cr32-action-text_sub.png cr16-action-music_natur.png cr32-mime-resource.png cr16-mime-template_source.png cr32-device-mouse.png cr16-device-cdaudio_mount.png cr32-action-goto.png cr22-filesys-network.png cr22-action-text_left.png crsc-device-memory_stick_unmount.svgz cr22-mime-source_moc.png cr22-action-1downarrow.png cr16-mime-make.png cr128-mime-cdr.png cr48-device-mo_unmount.png cr22-action-player_playlist.png cr64-mime-wordprocessing.png cr22-action-launch.png cr128-mime-source_pl.png cr16-action-bookmarks_list_add.png cr64-mime-tgz.png cr32-action-run.png cr128-filesys-folder_open.png cr16-action-apply.png cr32-action-apply.png crsc-device-usbpendrive_unmount.svgz cr16-mime-kexi_kexi.png cr16-action-fontsizeup.png cr16-filesys-trashcan_full.png cr32-mime-ascii.png cr128-filesys-folder_grey.png cr22-mime-widget_doc.png crsc-mime-encrypted.svgz cr22-action-misc.png cr22-action-text_under.png cr32-action-fileclose.png cr48-device-cdwriter_mount.png cr16-action-view_choose.png cr16-action-top.png cr48-mime-source_y.png cr32-device-mo_mount.png cr48-filesys-folder_video.png cr64-mime-zip.png crsc-mime-resource.svgz cr16-action-gohome.png cr22-filesys-folder_violet.png crsc-filesys-folder_man.svgz cr16-mime-txt.png cr16-action-player_stop.png cr16-action-player_pause.png cr22-device-smart_media_unmount.png cr22-action-rightjust.png cr128-mime-soffice.png cr128-mime-source_moc.png cr16-mime-karbon_karbon.png cr22-action-bookmark_add.png cr48-device-memory_stick_mount.png cr16-action-mail_reply.png cr64-mime-ascii.png crsc-mime-kugardata.svgz cr32-mime-tgz.png cr22-action-inline_image.png cr22-action-compfile.png cr64-action-share.png cr16-mime-gettext.png cr22-mime-unknown.png cr48-device-memory.png cr64-action-player_playlist.png cr32-mime-metafont.png cr48-action-wizard.png cr16-action-exec.png cr22-mime-exec_wine.png cr16-action-forward.png cr32-action-window_nofullscreen.png cr32-action-text_under.png cr128-mime-source_php.png cr32-action-queue.png cr32-mime-rpm.png cr48-action-mail_new.png crsc-mime-quicktime.svgz cr48-filesys-folder_red.png cr16-action-player_start.png cr22-action-bookmarks_list_add.png cr16-action-misc.png cr22-mime-make.png cr22-action-color_line.png crsc-device-camera_unmount.svgz cr16-mime-wordprocessing.png cr64-device-blockdevice.png cr128-mime-font_truetype.png cr48-mime-shellscript.png cr128-filesys-trashcan_full.png cr22-device-camera_unmount.png cr64-device-sd_mmc_mount.png cr16-action-signature.png cr16-action-math_lsup.png cr32-action-redo.png cr32-action-filefind.png cr128-action-contents2.png cr48-device-smart_media_unmount.png cr64-device-pda_black.png cr16-action-configure_shortcuts.png cr64-action-favorites.png cr16-action-kde6.png cr64-device-scanner.png cr32-action-rotate_ccw.png cr48-mime-core.png cr16-device-cdrom_unmount.png cr22-action-filesaveas.png cr64-filesys-folder_red_open.png cr16-action-halfencrypted.png cr22-mime-source_y.png cr32-device-smart_media_unmount.png cr32-action-mouse.png crsc-filesys-exec_wine.svgz cr32-mime-postscript.png cr32-device-memory.png cr22-mime-kivio_flw.png cr22-action-math_matrix.png cr16-action-bookmark_toolbar.png cr48-mime-cdimage.png cr128-mime-deb.png crsc-mime-exec_wine.svgz cr32-action-save_all.png cr16-mime-source_o.png cr16-filesys-server.png cr22-action-mail_post_to.png cr16-filesys-folder_green_open.png cr48-mime-rpm.png cr16-action-music_halfnote.png cr22-action-start.png cr48-mime-source_h.png cr32-device-pda_blue.png cr16-device-blockdevice.png cr16-mime-source_cpp.png cr48-mime-spreadsheet.png cr32-action-contents.png cr32-filesys-folder_yellow.png cr48-device-print_class.png cr16-action-text_bold.png cr128-device-smart_media_unmount.png cr22-action-2downarrow.png cr16-action-start.png cr22-action-editcopy.png cr22-action-text.png cr16-action-1rightarrow.png cr48-mime-unknown.png cr32-action-music_eightnote.png cr128-mime-log.png cr64-filesys-folder_crystal.png cr128-mime-source_java.png cr16-device-mo_mount.png cr22-action-player_end.png crsc-mime-document2.svgz cr16-filesys-folder_crystal.png cr32-action-math_sqrt.png cr16-action-key_enter.png cr32-filesys-folder_yellow_open.png cr32-action-bookmark_toolbar.png cr16-mime-message.png crsc-filesys-folder_yellow.svgz cr64-device-cdaudio_unmount.png cr48-device-pda_blue.png cr64-mime-pdf.png cr16-action-math_frac.png cr32-action-bookmark_add.png crsc-device-tv.svgz cr22-filesys-trashcan_empty.png cr16-action-inline_table.png cr64-mime-tar.png crsc-filesys-folder_image.svgz cr48-device-3floppy_unmount.png cr22-mime-source_f.png Makefile.am cr16-filesys-folder_sent_mail.png cr48-filesys-ftp.png cr128-mime-source_l.png cr128-filesys-zip.png cr16-action-up.png cr64-mime-soffice.png cr32-action-editcut.png cr16-filesys-folder_green.png cr22-action-math_sqrt.png cr32-mime-man.png cr16-action-undo.png cr22-action-news_unsubscribe.png cr16-action-frameprint.png cr22-action-editclear.png crsc-filesys-trashcan_empty.svgz cr128-mime-shellscript.png cr32-action-gear.png cr22-action-mail_send.png cr22-action-stop.png cr22-mime-recycled.png cr64-mime-vectorgfx.png cr22-action-viewmag-.png cr16-action-view_detailed.png cr16-device-camera_mount.png crsc-filesys-network.svgz cr32-action-music_natur.png cr22-action-frame_spreadsheet.png cr48-filesys-folder_open.png cr32-action-button_ok.png cr32-action-attach.png cr32-action-exec.png crsc-mime-netscape_doc.svgz cr22-mime-txt2.png cr22-action-redo.png cr64-filesys-folder_violet.png cr64-mime-source_o.png cr16-filesys-folder_red_open.png cr16-action-view_text.png cr22-action-filesave.png cr48-mime-misc.png cr22-action-mail_forward.png cr64-mime-binary.png crsc-mime-html.svgz cr16-action-kde3.png cr16-device-compact_flash_mount.png cr22-action-revert.png cr32-action-compfile.png cr128-filesys-folder_home.png cr128-mime-info.png cr48-mime-exec_wine.png cr16-action-identity.png cr32-mime-source_y.png cr16-action-rotate_ccw.png cr22-action-connect_no.png cr32-device-nfs_unmount.png cr32-filesys-ftp.png cr32-action-encrypted.png cr32-action-player_start.png cr48-filesys-network.png cr32-action-mail_delete.png cr22-device-usbpendrive_unmount.png cr16-filesys-folder_violet.png cr22-action-toggle_log.png cr22-action-math_onetwomatrix.png cr64-mime-message.png crsc-mime-document.svgz cr16-action-decrypted.png cr22-action-identity.png cr22-action-viewmagfit.png cr22-mime-sound.png cr48-filesys-folder_inbox.png crsc-filesys-temporary.svgz cr16-action-crop.png cr32-mime-kword_kwd.png cr22-action-math_brackets.png cr16-mime-ascii.png cr22-action-math_sum.png cr32-action-start.png cr32-device-tv.png cr128-mime-font_bitmap.png cr16-action-edit.png cr16-action-2uparrow.png cr16-filesys-folder_red.png cr16-mime-netscape_doc.png cr32-action-music_halfnote.png cr32-action-mail_get.png crsc-filesys-folder_tar.svgz cr128-mime-document.png cr16-action-view_top_bottom.png cr64-device-3floppy_mount.png cr22-mime-ascii.png crsc-mime-source_j.svgz Makefile.in crsc-mime-file_locked.svgz cr64-filesys-folder_red.png cr22-mime-html.png cr32-filesys-lockoverlay.png cr22-filesys-folder_open.png crsc-mime-source_pl.svgz cr64-filesys-www.png crsc-filesys-lockoverlay.svgz crsc-mime-vcalendar.svgz cr22-device-joystick.png cr16-action-run.png cr128-mime-colorscm.png cr32-action-filter.png crsc-device-cdrom_unmount.svgz cr22-action-rotate.png cr16-action-queue.png cr128-device-sd_mmc_unmount.png cr48-mime-tar.png cr32-filesys-exec.png cr16-filesys-folder_yellow_open.png cr22-action-2leftarrow.png cr22-action-mail_get.png cr48-mime-vcalendar.png cr22-device-usbpendrive_mount.png cr48-mime-widget_doc.png cr16-action-unlock.png crsc-filesys-home_blue.svgz cr32-mime-log.png cr16-mime-vcalendar.png cr16-action-1downarrow.png cr22-action-filter.png cr128-mime-rpm.png cr128-filesys-folder_green.png cr32-filesys-folder_orange_open.png cr128-mime-binary.png cr22-action-charset.png cr16-filesys-folder_man.png cr22-action-text_super.png cr32-action-folder_new.png cr16-action-stamp.png cr16-action-mail_find.png cr128-mime-message.png cr22-action-today.png cr64-mime-kugar_kud.png cr16-action-bottom.png cr22-action-button_ok.png cr32-filesys-folder_tar.png cr64-mime-font.png cr32-action-project_open.png cr16-action-2downarrow.png cr22-mime-man.png cr22-action-window_nofullscreen.png cr48-mime-readme.png cr16-mime-source_moc.png cr16-device-cdrom_mount.png cr16-device-cdaudio_unmount.png cr64-mime-postscript.png cr16-device-smart_media_mount.png cr16-action-pencil.png cr16-action-launch.png crsc-mime-txt.svgz cr48-device-memory_stick_unmount.png crsc-action-contents2.svgz cr32-filesys-folder_sound.png cr22-action-math_int.png cr128-filesys-folder_violet.png cr64-device-hdd_unmount.png cr64-mime-source_l.png cr32-mime-readme.png crsc-mime-binary.svgz crsc-mime-colorscm.svgz cr32-action-editshred.png cr64-mime-tex.png cr48-mime-vectorgfx.png cr128-mime-gf.png cr16-mime-font_truetype.png cr22-action-viewmag.png cr128-mime-source_p.png cr16-filesys-folder_print.png crsc-device-zip_mount.svgz cr16-action-mail_post_to.png cr32-mime-pk.png cr64-mime-source_p.png cr16-device-system.png crsc-mime-pdf.svgz cr16-mime-source_f.png cr32-mime-kivio_flw.png cr22-filesys-folder_violet_open.png cr32-device-tablet.png cr22-action-editshred.png cr16-action-1leftarrow.png crsc-filesys-folder_cyan_open.svgz cr16-action-filesave.png cr22-action-math_lsup.png cr16-device-zip_mount.png cr128-mime-spreadsheet.png cr22-action-edittrash.png cr32-action-unindent.png cr128-filesys-folder_sound.png cr32-mime-source_moc.png cr128-action-fileprint.png cr64-mime-kword_kwd.png cr16-action-text_under.png cr16-mime-font_bitmap.png cr32-action-music_32ndnote.png cr16-mime-pdf.png cr22-mime-encrypted.png cr16-device-mouse.png crsc-filesys-zip.svgz cr22-action-paintbrush.png cr16-action-rebuild.png cr16-action-kde1.png cr32-mime-unknown.png cr22-action-next.png cr22-action-fileclose.png cr22-mime-tar.png cr16-action-player_eject.png cr48-mime-postscript.png cr48-mime-koffice.png cr16-action-stop.png cr16-action-fontsizedown.png cr16-action-player_rew.png cr32-action-filenew.png cr48-action-indent.png cr16-action-connect_established.png cr16-action-math_onetwomatrix.png cr16-action-editcut.png cr64-mime-karbon_karbon.png cr64-action-filequickprint.png cr32-mime-font.png cr48-action-down.png cr32-action-unlock.png cr48-filesys-folder_sound.png cr16-device-sd_mmc_mount.png cr32-mime-vcalendar.png cr32-action-back.png cr48-filesys-folder_crystal.png cr16-action-view_left_right.png cr32-action-view_remove.png cr16-action-text_italic.png cr16-mime-document.png cr64-filesys-folder_green.png cr128-filesys-desktop.png cr48-device-pda_black.png cr128-mime-video.png cr22-action-frameprint.png cr22-mime-font_type1.png crsc-device-compact_flash_mount.svgz cr22-action-viewmag+.png cr16-mime-html.png cr32-mime-txt.png cr32-filesys-folder_violet.png cr32-action-mail_replyall.png cr32-filesys-folder_image.png cr32-device-hdd_mount.png cr22-device-3floppy_mount.png cr48-filesys-folder_grey.png cr32-mime-kchart_chrt.png crsc-device-cdrom_mount.svgz cr16-action-tab_duplicate.png cr22-action-frame_query.png cr32-mime-message.png crsc-action-mail_generic.svgz cr22-action-clear_left.png cr16-action-music_flat.png cr22-mime-font_truetype.png cr48-device-camera_mount.png cr22-action-frame_image.png cr16-action-thumbnail.png cr32-mime-soffice.png cr48-device-system.png cr22-action-idea.png cr48-mime-font_bitmap.png cr32-mime-vectorgfx.png cr48-filesys-trashcan_full.png cr48-mime-dvi.png cr48-mime-mozilla_doc.png cr32-action-halfencrypted.png cr16-action-player_playlist.png cr32-mime-core.png cr32-mime-source_cpp.png cr16-filesys-folder_open.png crsc-device-cdaudio_unmount.svgz cr32-mime-colorscm.png cr64-mime-source_py.png cr16-action-music_dottednote.png cr16-action-next.png cr16-mime-image.png cr48-mime-recycled.png cr16-action-mail_new.png cr16-action-openterm.png cr64-mime-kpresenter_kpr.png cr32-mime-document2.png cr64-device-usbpendrive_mount.png cr22-mime-binary.png cr48-filesys-zip.png cr32-filesys-folder_man.png cr16-action-colorize.png crsc-mime-tex.svgz cr22-mime-tex.png cr16-action-bookmark_add.png cr16-mime-recycled.png cr32-action-find.png cr128-mime-kmultiple.png cr32-filesys-link.png cr22-mime-font.png crsc-mime-postscript.svgz crsc-mime-core.svgz cr16-action-viewmagfit.png cr64-mime-kspread_ksp.png cr64-device-pda_blue.png cr16-device-camera_unmount.png crsc-device-sd_mmc_unmount.svgz cr22-mime-kspread_ksp.png cr32-action-spellcheck.png cr22-action-fileopen.png cr32-action-music_quarternote.png cr128-filesys-trashcan_empty.png cr32-action-signature.png cr32-filesys-folder_crystal.png cr64-mime-source_cpp.png cr22-action-text_sub.png cr22-action-mail_generic.png cr128-device-hdd_mount.png cr128-mime-core.png cr64-device-5floppy_mount.png cr64-filesys-trashcan_empty.png cr64-mime-info.png cr64-device-mo_unmount.png cr22-action-editpaste.png cr22-action-folder.png cr32-action-text_italic.png cr64-device-smart_media_unmount.png cr22-action-locationbar_erase.png cr16-action-project_open.png cr16-action-bookmark_folder.png cr128-filesys-folder_red_open.png cr32-mime-image.png crsc-mime-mozilla_doc.svgz cr32-device-camera_unmount.png cr32-mime-netscape_doc.png cr22-action-1uparrow.png cr32-mime-cdtrack.png cr22-action-undo.png cr32-action-rebuild.png cr48-filesys-folder_yellow_open.png cr22-action-down.png cr22-action-news_subscribe.png cr32-filesys-folder_red.png cr32-mime-source_h.png cr48-mime-source_java.png cr64-mime-netscape_doc.png cr128-filesys-folder_crystal.png cr128-mime-txt2.png cr16-action-transform.png cr16-action-viewmag-.png cr32-mime-applix.png cr32-action-reload_page.png cr16-device-dvd_unmount.png cr32-mime-info.png cr32-device-zip_mount.png cr64-device-zip_unmount.png cr16-action-today.png cr16-action-completion.png crsc-mime-gf.svgz cr64-device-tablet.png cr22-device-3floppy_unmount.png cr64-mime-txt.png cr16-device-memory.png cr32-action-viewmag+.png cr48-mime-font_type1.png cr48-device-printer1.png cr16-mime-kugar_kud.png cr16-filesys-pipe.png crsc-action-text_under.svgz cr32-action-undo.png cr16-mime-zip.png cr32-filesys-folder_print.png cr48-mime-empty.png cr22-action-view_sidetree.png cr22-mime-metafont.png cr32-action-messagebox_warning.png cr22-action-2uparrow.png cr16-action-player_fwd.png cr32-action-openterm.png cr22-action-openterm.png crsc-mime-font_truetype.svgz cr128-mime-man.png cr16-action-configure_toolbars.png cr32-device-dvd_mount.png cr32-mime-sound.png cr22-action-kde.png cr64-mime-metafont.png cr48-filesys-folder_man.png cr32-action-up.png cr128-filesys-folder.png cr128-mime-sound.png cr22-action-math_prod.png cr128-device-memory_stick_unmount.png cr22-action-editcut.png crsc-filesys-folder_open.svgz cr48-mime-tgz.png cr22-action-music_cleficon.png crsc-filesys-www.svgz cr32-action-editclear.png cr22-mime-source_cpp.png cr48-mime-wordprocessing.png cr64-mime-font_bitmap.png cr22-action-view_tree.png cr22-action-share.png cr48-mime-source_py.png cr64-filesys-folder_man.png cr22-action-1leftarrow.png cr128-device-camera_mount.png cr64-action-contents2.png cr32-filesys-folder_txt.png cr32-action-math_rsup.png cr48-device-zip_unmount.png cr22-action-music_cross.png cr16-mime-tex.png cr48-device-nfs_unmount.png cr22-mime-colorscm.png cr64-filesys-folder_image.png cr32-mime-quicktime.png cr16-mime-unknown.png cr32-device-smart_media_mount.png cr16-mime-applix.png cr128-mime-mozilla_doc.png cr32-mime-source_py.png cr128-mime-vectorgfx.png cr16-mime-gf.png crsc-device-cdwriter_mount.svgz cr22-action-attach.png cr16-action-text_right.png cr16-action-contents2.png cr16-device-smart_media_unmount.png cr22-filesys-folder_home.png cr22-mime-source.png cr48-device-5floppy_mount.png cr22-action-math_paren.png cr64-device-dvd_unmount.png crsc-filesys-services.svgz cr64-mime-kchart_chrt.png cr16-action-math_matrix.png cr48-device-cdaudio_mount.png cr16-device-hdd_unmount.png cr32-action-math_frac.png cr16-action-compfile.png cr32-mime-kmultiple.png cr128-device-blockdevice.png cr48-device-compact_flash_unmount.png 
  
  #>+ 2
  docs-am:
  
- #>+ 3668
+-#>+ 3668
++#>+ 3670
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes
 -	$(INSTALL_DATA) $(srcdir)/cr64-mime-source_moc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/source_moc.png
@@ -21391,6 +24055,7 @@
 +	$(INSTALL_DATA) $(srcdir)/cr48-action-frameprint.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/frameprint.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-action-view_top_bottom.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_top_bottom.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-filesys-folder_red.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red.png
++	$(INSTALL_DATA) $(srcdir)/cr64-action-player_play.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-frame_query.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_query.png
 +	$(INSTALL_DATA) $(srcdir)/crsc-mime-gf.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/gf.svgz
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-math_paren.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_paren.png
@@ -24334,6 +26999,7 @@
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/frameprint.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/view_top_bottom.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/filesystems/folder_red.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/player_play.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/frame_query.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/gf.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/math_paren.png
@@ -25435,8 +28101,14 @@
  #>+ 15
  force-reedit:
 diff -Nru kdelibs-3.4.2.orig/pics/emoticons/Makefile.in kdelibs-3.4.2/pics/emoticons/Makefile.in
---- kdelibs-3.4.2.orig/pics/emoticons/Makefile.in	2005-07-20 21:20:21.000000000 +0000
-+++ kdelibs-3.4.2/pics/emoticons/Makefile.in	2005-07-26 18:50:04.000000000 +0000
+--- kdelibs-3.4.2.orig/pics/emoticons/Makefile.in	2005-07-20 17:20:21.000000000 -0400
++++ kdelibs-3.4.2/pics/emoticons/Makefile.in	2005-08-16 10:58:52.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -25469,8 +28141,14 @@
  
  mostlyclean-libtool:
 diff -Nru kdelibs-3.4.2.orig/pics/hicolor/Makefile.in kdelibs-3.4.2/pics/hicolor/Makefile.in
---- kdelibs-3.4.2.orig/pics/hicolor/Makefile.in	2005-07-20 21:20:21.000000000 +0000
-+++ kdelibs-3.4.2/pics/hicolor/Makefile.in	2005-07-26 18:50:04.000000000 +0000
+--- kdelibs-3.4.2.orig/pics/hicolor/Makefile.in	2005-07-20 17:20:21.000000000 -0400
++++ kdelibs-3.4.2/pics/hicolor/Makefile.in	2005-08-16 10:58:52.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
 @@ -225,6 +225,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
@@ -25552,9 +28230,24 @@
  #>+ 15
  force-reedit:
 diff -Nru kdelibs-3.4.2.orig/pics/Makefile.in kdelibs-3.4.2/pics/Makefile.in
---- kdelibs-3.4.2.orig/pics/Makefile.in	2005-07-20 21:20:20.000000000 +0000
-+++ kdelibs-3.4.2/pics/Makefile.in	2005-07-26 18:50:02.000000000 +0000
-@@ -272,6 +272,9 @@
+--- kdelibs-3.4.2.orig/pics/Makefile.in	2005-07-20 17:20:20.000000000 -0400
++++ kdelibs-3.4.2/pics/Makefile.in	2005-08-16 10:58:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
+ # @configure_input@
+ 
+@@ -15,8 +15,6 @@
+ 
+ @SET_MAKE@
+ 
+-SOURCES = $(kimage_concat_SOURCES) $(ksvgtopng_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -272,6 +270,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25564,7 +28257,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -520,7 +523,7 @@
+@@ -520,7 +521,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25573,7 +28266,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -558,9 +561,9 @@
+@@ -558,9 +559,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25585,7 +28278,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -924,7 +927,7 @@
+@@ -924,7 +925,7 @@
  .NOEXPORT:
  
  #>+ 2




More information about the Pkg-kde-commits mailing list