[Pkg-kde-commits] rev 1109 - in branches/kde-3.4.0/packages/kdenetwork/debian: . patches

Isaac Clerencia isaac@costa.debian.org
Tue, 24 May 2005 15:20:55 +0000


Author: isaac
Date: 2005-05-24 15:20:43 +0000 (Tue, 24 May 2005)
New Revision: 1109

Removed:
   branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kopete_fix_msn.diff
Modified:
   branches/kde-3.4.0/packages/kdenetwork/debian/changelog
   branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
kdenetwork 3.4.1  stuff:
* Update changelog
* Remove MSN fix patch
* Update buildprep patch


Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-05-24 14:30:38 UTC (rev 1108)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-05-24 15:20:43 UTC (rev 1109)
@@ -1,3 +1,9 @@
+kdenetwork (4:3.4.1-1) experimental; urgency=low
+
+  * New upstream release 
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 24 May 2005 17:18:33 +0200
+
 kdenetwork (4:3.4.0-0pre2) alioth; urgency=low
 
   * New upstream release.

Deleted: branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kopete_fix_msn.diff

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff	2005-05-24 14:30:38 UTC (rev 1108)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff	2005-05-24 15:20:43 UTC (rev 1109)
@@ -1,123 +1,7 @@
-#DPATCHLEVEL=1
-diff -Nrua kdenetwork-3.4.0.orig/Makefile.in kdenetwork-3.4.0/Makefile.in
---- kdenetwork-3.4.0.orig/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/Makefile.in	2005-03-05 23:23:46.263592824 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -221,6 +221,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
- .SUFFIXES:
- am--refresh:
- 	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -463,12 +466,12 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- #>- 	cd $(srcdir) && $(AUTOCONF)
- #>+ 2
- 	cd $(srcdir) && rm -f configure
- 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
- config.h: stamp-h1
-@@ -480,7 +483,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in:  $(am__configure_deps) 
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
- 	cd $(top_srcdir) && $(AUTOHEADER)
- 	rm -f stamp-h1
- 	touch $@
-@@ -505,7 +508,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -517,7 +526,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -525,7 +534,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -546,7 +561,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -885,7 +900,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in 
- 
- #>+ 2
- docs-am:
-diff -Nrua kdenetwork-3.4.0.orig/acinclude.m4 kdenetwork-3.4.0/acinclude.m4
---- kdenetwork-3.4.0.orig/acinclude.m4	2005-03-04 12:34:59.000000000 +0000
-+++ kdenetwork-3.4.0/acinclude.m4	2005-03-05 23:22:08.533450064 +0000
-@@ -1682,15 +1682,6 @@
+diff -Nrua kdenetwork-3.4.1.orig/acinclude.m4 kdenetwork-3.4.1/acinclude.m4
+--- kdenetwork-3.4.1.orig/acinclude.m4	2005-05-23 18:06:46.000000000 +0200
++++ kdenetwork-3.4.1/acinclude.m4	2005-05-24 17:05:18.000000000 +0200
+@@ -1690,15 +1690,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -133,7 +17,7 @@
    fi
    AC_SUBST(KDE_USE_CLOSURE_TRUE)
    AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2131,9 +2122,6 @@
+@@ -2139,9 +2130,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -143,7 +27,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -5686,6 +5674,7 @@
+@@ -5770,6 +5758,7 @@
  ## the same distribution terms that you use for the rest of that program.
  
  # serial 47 AC_PROG_LIBTOOL
@@ -151,7 +35,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5734,7 @@
+@@ -5829,7 +5818,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -160,7 +44,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6159,12 +6148,11 @@
+@@ -6243,12 +6232,11 @@
    if AC_TRY_EVAL(ac_compile); then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
@@ -174,7 +58,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6176,7 +6164,6 @@
+@@ -6260,7 +6248,6 @@
        esac
        ;;
      *64-bit*)
@@ -182,7 +66,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6293,7 @@
+@@ -6390,7 +6377,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -191,7 +75,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6335,20 +6322,26 @@
+@@ -6419,20 +6406,26 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -223,7 +107,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.
-@@ -6498,7 +6491,7 @@
+@@ -6582,7 +6575,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -232,7 +116,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6580,6 @@
+@@ -6671,13 +6664,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -246,7 +130,7 @@
     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.
-@@ -6617,8 +6603,11 @@
+@@ -6701,8 +6687,11 @@
       fi
     fi
     chmod u+w .
@@ -260,7 +144,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6735,7 +6724,7 @@
+@@ -6819,7 +6808,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -269,7 +153,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -6748,7 +6737,7 @@
+@@ -6832,7 +6821,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -278,7 +162,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -6758,7 +6747,20 @@
+@@ -6842,7 +6831,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -300,7 +184,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -6823,7 +6825,7 @@
+@@ -6907,7 +6909,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -309,7 +193,7 @@
    ;;
  
  beos*)
-@@ -6848,7 +6850,7 @@
+@@ -6932,7 +6934,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -318,7 +202,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -6913,7 +6915,7 @@
+@@ -6997,7 +6999,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -327,7 +211,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"`
-@@ -6936,7 +6938,7 @@
+@@ -7020,7 +7022,7 @@
    dynamic_linker=no
    ;;
  
@@ -336,7 +220,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -6996,7 +6998,7 @@
+@@ -7080,7 +7082,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -345,7 +229,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7013,7 @@
+@@ -7095,7 +7097,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -354,7 +238,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7022,7 +7024,7 @@
+@@ -7106,7 +7108,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -363,7 +247,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7084,22 +7086,19 @@
+@@ -7168,22 +7170,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'
@@ -392,7 +276,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,
-@@ -7109,6 +7108,30 @@
+@@ -7193,6 +7192,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -423,7 +307,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7118,7 +7141,7 @@
+@@ -7202,7 +7225,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -432,7 +316,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7147,7 +7170,7 @@
+@@ -7231,7 +7254,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -441,7 +325,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
-@@ -7167,7 +7190,7 @@
+@@ -7251,7 +7274,7 @@
  
  os2*)
    libname_spec='$name'
@@ -450,7 +334,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7781,23 @@
+@@ -7842,31 +7865,23 @@
    ;;
  
  cygwin*)
@@ -491,7 +375,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7821,42 +7836,21 @@
+@@ -7905,42 +7920,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -541,7 +425,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
-@@ -7885,9 +7879,6 @@
+@@ -7969,9 +7963,6 @@
    ;;
  
  osf3* | osf4* | osf5*)
@@ -551,7 +435,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7897,7 +7888,6 @@
+@@ -7981,7 +7972,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -559,7 +443,7 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8153,7 @@
+@@ -8247,7 +8237,7 @@
  fi
  if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
    AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -568,7 +452,7 @@
    else
      AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
      _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8213,7 +8203,7 @@
+@@ -8297,7 +8287,7 @@
    fi
    ;;
  
@@ -577,7 +461,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -8223,29 +8213,29 @@
+@@ -8307,29 +8297,29 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case "$host_os" in
      rhapsody* | darwin1.[[012]])
@@ -621,7 +505,7 @@
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8253,8 +8243,8 @@
+@@ -8337,8 +8327,8 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
    else
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -632,7 +516,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8362,8 +8352,8 @@
+@@ -8446,8 +8436,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
@@ -643,7 +527,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8389,7 +8379,7 @@
+@@ -8473,7 +8463,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.
@@ -652,7 +536,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8409,22 @@
+@@ -8503,8 +8493,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -677,7 +561,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8466,15 +8470,16 @@
+@@ -8550,15 +8554,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -698,7 +582,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.
-@@ -8483,13 +8488,12 @@
+@@ -8567,13 +8572,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -714,7 +598,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8508,7 @@
+@@ -8588,7 +8592,7 @@
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
  	# This is similar to how AIX traditionally builds it's shared libraries.
@@ -723,7 +607,7 @@
        fi
      fi
      ;;
-@@ -8521,12 +8525,12 @@
+@@ -8605,12 +8609,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
      # as there is no search path for DLLs.
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -738,7 +622,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8535,7 +8539,7 @@
+@@ -8619,7 +8623,7 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -747,7 +631,7 @@
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
-@@ -8546,20 +8550,20 @@
+@@ -8630,20 +8634,20 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case "$host_os" in
      rhapsody* | darwin1.[[012]])
@@ -778,7 +662,7 @@
        fi
        ;;
      esac
-@@ -8569,19 +8573,19 @@
+@@ -8653,19 +8657,19 @@
        lt_int_apple_cc_single_mod=yes
      fi
      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -804,7 +688,7 @@
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8616,7 +8620,7 @@
+@@ -8700,7 +8704,7 @@
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
@@ -813,7 +697,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8638,7 +8642,7 @@
+@@ -8722,7 +8726,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
      aCC)
@@ -822,7 +706,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8647,11 +8651,11 @@
+@@ -8731,11 +8735,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.
@@ -836,7 +720,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8712,7 @@
+@@ -8792,7 +8796,7 @@
  	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -845,7 +729,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8733,7 @@
+@@ -8813,7 +8817,7 @@
  	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -854,7 +738,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -8744,7 +8748,7 @@
+@@ -8828,7 +8832,7 @@
      case $cc_basename in
        CC)
  	# SGI C++
@@ -863,7 +747,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -8755,9 +8759,9 @@
+@@ -8839,9 +8843,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -875,7 +759,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8778,8 @@
+@@ -8858,8 +8862,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.
@@ -886,7 +770,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -8797,16 +8801,16 @@
+@@ -8881,16 +8885,16 @@
  	# Intel C++
  	with_gnu_ld=yes
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -907,7 +791,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8848,7 @@
+@@ -8928,7 +8932,7 @@
  	;;
      esac
      ;;
@@ -916,7 +800,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -8863,7 +8867,7 @@
+@@ -8947,7 +8951,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.
@@ -925,7 +809,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8884,7 @@
+@@ -8964,7 +8968,7 @@
  	;;
        cxx)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -934,7 +818,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8902,7 @@
+@@ -8982,7 +8986,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -943,7 +827,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8927,7 @@
+@@ -9007,7 +9011,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.
@@ -952,7 +836,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8943,10 @@
+@@ -9023,10 +9027,10 @@
  	;;
        cxx)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -965,7 +849,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +8965,7 @@
+@@ -9045,7 +9049,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -974,7 +858,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9022,9 @@
+@@ -9102,9 +9106,9 @@
        CC)
  	# Sun C++ 4.2, 5.x and Centerline C++
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -986,7 +870,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9058,7 @@
+@@ -9138,7 +9142,7 @@
  	;;
        gcx)
  	# Green Hills C++ Compiler
@@ -995,7 +879,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9064,9 +9068,9 @@
+@@ -9148,9 +9152,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -1007,7 +891,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9079,9 @@
+@@ -9159,9 +9163,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -1019,7 +903,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9249,7 @@
+@@ -9329,7 +9333,7 @@
         fi
         ;;
  
@@ -1028,7 +912,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9354,7 +9358,7 @@
+@@ -9438,7 +9442,7 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -1037,7 +921,7 @@
    test "$enable_shared" = yes && enable_static=no
    ;;
  esac
-@@ -9496,11 +9500,12 @@
+@@ -9580,11 +9584,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -1052,7 +936,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 \
-@@ -9550,7 +9555,7 @@
+@@ -9634,7 +9639,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1061,7 +945,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9681,7 +9686,7 @@
+@@ -9765,7 +9770,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -1070,7 +954,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9717,7 @@
+@@ -9796,7 +9801,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -1079,7 +963,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -9956,7 +9961,10 @@
+@@ -10040,7 +10045,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.
@@ -1091,7 +975,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10029,7 +10037,7 @@
+@@ -10113,7 +10121,7 @@
    symcode='[[BCDEGQRST]]'
    ;;
  solaris* | sysv5*)
@@ -1100,7 +984,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10047,7 +10055,7 @@
+@@ -10131,7 +10139,7 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -1109,7 +993,7 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -10262,7 +10270,7 @@
+@@ -10346,7 +10354,7 @@
  	    ;;
  	esac
  	;;
@@ -1118,7 +1002,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10321,7 @@
+@@ -10397,7 +10405,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1127,7 +1011,7 @@
  	  cxx)
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10338,7 +10346,7 @@
+@@ -10422,7 +10430,7 @@
  	    ;;
  	esac
  	;;
@@ -1136,7 +1020,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -10649,6 +10657,9 @@
+@@ -10733,6 +10741,9 @@
    cygwin* | mingw*)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -1146,7 +1030,7 @@
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -10673,7 +10684,7 @@
+@@ -10757,7 +10768,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -1155,7 +1039,7 @@
    _LT_AC_TAGVAR(always_export_symbols, $1)=no
    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    # include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10747,7 +10758,7 @@
+@@ -10831,7 +10842,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -1164,7 +1048,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10757,13 +10768,13 @@
+@@ -10841,13 +10852,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
        # as there is no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1180,7 +1064,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10772,19 +10783,19 @@
+@@ -10856,19 +10867,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -1204,7 +1088,7 @@
        fi
        ;;
  
-@@ -10802,8 +10813,8 @@
+@@ -10886,8 +10897,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1215,7 +1099,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10816,10 +10827,36 @@
+@@ -10900,10 +10911,36 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
@@ -1254,7 +1138,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10869,9 +10906,20 @@
+@@ -10953,9 +10990,20 @@
  	else
  	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -1277,7 +1161,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -10917,29 +10965,29 @@
+@@ -11001,29 +11049,29 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -1316,7 +1200,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11002,7 @@
+@@ -11038,7 +11086,7 @@
  	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
  	  # This is similar to how AIX traditionally builds it's shared libraries.
@@ -1325,7 +1209,7 @@
  	fi
        fi
        ;;
-@@ -10977,13 +11025,13 @@
+@@ -11061,13 +11109,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1342,7 +1226,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
        # FIXME: Should let the user specify the lib program.
-@@ -10997,21 +11045,21 @@
+@@ -11081,21 +11129,21 @@
        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
        case "$host_os" in
        rhapsody* | darwin1.[[012]])
@@ -1377,7 +1261,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11068,26 @@
+@@ -11104,26 +11152,26 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1412,7 +1296,7 @@
        ;;
  
      dgux*)
-@@ -11072,8 +11120,8 @@
+@@ -11156,8 +11204,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1423,7 +1307,7 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11081,7 +11129,7 @@
+@@ -11165,7 +11213,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -1432,7 +1316,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -11099,10 +11147,10 @@
+@@ -11183,10 +11231,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -1445,7 +1329,7 @@
  	  ;;
  	esac
        else
-@@ -11149,7 +11197,7 @@
+@@ -11233,7 +11281,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -1454,7 +1338,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11159,7 +11207,7 @@
+@@ -11243,7 +11291,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -1463,7 +1347,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -11182,7 +11230,7 @@
+@@ -11266,7 +11314,7 @@
        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1472,7 +1356,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11192,7 +11240,7 @@
+@@ -11276,7 +11324,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -1481,7 +1365,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11203,14 +11251,14 @@
+@@ -11287,14 +11335,14 @@
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1498,7 +1382,7 @@
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11222,7 +11270,7 @@
+@@ -11306,7 +11354,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1507,7 +1391,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11247,9 +11295,9 @@
+@@ -11331,9 +11379,9 @@
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
@@ -1519,7 +1403,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11269,7 +11317,7 @@
+@@ -11353,7 +11401,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.
@@ -1528,7 +1412,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11329,9 +11377,9 @@
+@@ -11413,9 +11461,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -1540,7 +1424,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11437,7 @@
+@@ -11473,7 +11521,7 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1549,7 +1433,7 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11548,8 +11596,8 @@
+@@ -11632,8 +11680,8 @@
      fi
    done
  done
@@ -1559,361 +1443,25 @@
  AC_MSG_RESULT([$SED])
  ])
  
-diff -Nrua kdenetwork-3.4.0.orig/aclocal.m4 kdenetwork-3.4.0/aclocal.m4
---- kdenetwork-3.4.0.orig/aclocal.m4	2005-03-04 12:35:15.000000000 +0000
-+++ kdenetwork-3.4.0/aclocal.m4	2005-03-05 23:22:21.656455064 +0000
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,23 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--#                                                        -*- Autoconf -*-
--# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
-@@ -40,26 +28,15 @@
- # 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.1])])
--
--# AM_AUX_DIR_EXPAND
-+	 [AM_AUTOMAKE_VERSION([1.9.5])])
- 
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-@@ -106,26 +83,16 @@
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
- 
--# AM_CONDITIONAL                                              -*- Autoconf -*-
--
--# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 6
-+# serial 7
- 
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -149,26 +116,15 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
- 
--# serial 7						-*- Autoconf -*-
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+# serial 8
- 
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -177,7 +133,6 @@
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -317,27 +272,16 @@
- AC_SUBST([AMDEPBACKSLASH])
- ])
- 
--# Generate code to set up dependency tracking.   -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--#   Free Software Foundation, Inc.
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--#serial 2
-+#serial 3
- 
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -396,54 +340,31 @@
-      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
- 
--# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 7
-+# serial 8
- 
- # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
- 
--# Do all the work for Automake.                            -*- Autoconf -*-
--
--# This macro actually does too much some checks are only needed if
--# your package does certain things.  But this isn't really a big deal.
-+# Do all the work for Automake.                             -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# serial 12
- 
--# serial 11
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
- 
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -545,51 +466,27 @@
- done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
- 
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_INSTALL_SH
- # ------------------
- # Define $install_sh.
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
- 
--#                                                          -*- Autoconf -*-
--# Copyright (C) 2003  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 1
-+# serial 2
- 
- # Check whether the underlying file-system supports filenames
- # with a leading dot.  For instance MS-DOS doesn't.
-@@ -604,26 +501,44 @@
+diff -Nrua kdenetwork-3.4.1.orig/aclocal.m4 kdenetwork-3.4.1/aclocal.m4
+--- kdenetwork-3.4.1.orig/aclocal.m4	2005-05-23 18:07:03.000000000 +0200
++++ kdenetwork-3.4.1/aclocal.m4	2005-05-24 17:05:30.000000000 +0200
+@@ -501,6 +501,35 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
  
--# Check to see how 'make' treats includes.	-*- Autoconf -*-
 +# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 +# From Jim Meyering
- 
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++
 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
 +# Free Software Foundation, Inc.
 +#
 +# This file is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
++
 +# serial 4
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
++
 +AC_DEFUN([AM_MAINTAINER_MODE],
 +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 +  dnl maintainer-mode is disabled by default
@@ -1928,3423 +1476,15 @@
 +  AC_SUBST(MAINT)dnl
 +]
 +)
- 
--# serial 2
++
 +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 +
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
+ # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -667,27 +582,16 @@
- rm -f confinc confmf
- ])
- 
--#  -*- Autoconf -*-
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 3
-+# serial 4
- 
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -713,27 +617,16 @@
- fi
- ])
- 
-+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_MKDIR_P
- # ---------------
- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+#
- # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
- # created by `make install' are always world readable, even if the
- # installer happens to have an overly restrictive umask (e.g. 077).
-@@ -787,26 +680,15 @@
- fi
- AC_SUBST([mkdir_p])])
- 
--# Helper functions for option handling.                    -*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Helper functions for option handling.                     -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 2
-+# serial 3
- 
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -831,28 +713,16 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 3
-+# serial 4
- 
- # AM_SANITY_CHECK
- # ---------------
-@@ -895,25 +765,14 @@
- fi
- AC_MSG_RESULT(yes)])
- 
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries.  This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -936,25 +795,13 @@
- 
- # Check how to create a tarball.                            -*- Autoconf -*-
- 
--# Copyright (C) 2004  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 1
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# serial 2
- 
- # _AM_PROG_TAR(FORMAT)
- # --------------------
-diff -Nrua kdenetwork-3.4.0.orig/admin/config.guess kdenetwork-3.4.0/admin/config.guess
---- kdenetwork-3.4.0.orig/admin/config.guess	2004-08-02 14:17:40.000000000 +0000
-+++ kdenetwork-3.4.0/admin/config.guess	2005-03-05 23:23:54.156392936 +0000
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
- 
--timestamp='2004-06-24'
-+timestamp='2004-11-12'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -203,9 +203,6 @@
-     amiga:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
--    arc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-     cats:OpenBSD:*:*)
- 	echo arm-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -230,18 +227,12 @@
-     mvmeppc:OpenBSD:*:*)
- 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
--    pmax:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-     sgi:OpenBSD:*:*)
--	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+	echo mips64-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     sun3:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
--    wgrisc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-     *:OpenBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -328,6 +319,9 @@
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
- 	exit 0 ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit 0 ;;
-     *:OS400:*:*)
-         echo powerpc-ibm-os400
- 	exit 0 ;;
-@@ -351,7 +345,7 @@
-     DRS?6000:unix:4.0:6*)
- 	echo sparc-icl-nx6
- 	exit 0 ;;
--    DRS?6000:UNIX_SV:4.2*:7*)
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
- 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
- 	esac ;;
-@@ -833,6 +827,12 @@
-     cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
- 	exit 0 ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit 0 ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit 0 ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-@@ -1081,7 +1081,7 @@
- 	exit 0 ;;
-     M68*:*:R3V[5678]*:*)
- 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -1179,9 +1179,10 @@
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- 	exit 0 ;;
-     *:Darwin:*:*)
--	case `uname -p` in
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
- 	    *86) UNAME_PROCESSOR=i686 ;;
--	    powerpc) UNAME_PROCESSOR=powerpc ;;
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -1249,7 +1250,10 @@
- 	    A*) echo alpha-dec-vms && exit 0 ;;
- 	    I*) echo ia64-dec-vms && exit 0 ;;
- 	    V*) echo vax-dec-vms && exit 0 ;;
--	esac
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit 0 ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -Nrua kdenetwork-3.4.0.orig/admin/config.guess.cdbs-orig kdenetwork-3.4.0/admin/config.guess.cdbs-orig
---- kdenetwork-3.4.0.orig/admin/config.guess.cdbs-orig	1970-01-01 00:00:00.000000000 +0000
-+++ kdenetwork-3.4.0/admin/config.guess.cdbs-orig	2004-08-02 14:17:40.000000000 +0000
-@@ -0,0 +1,1449 @@
-+#! /bin/sh
-+# Attempt to guess a canonical system name.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+
-+timestamp='2004-06-24'
-+
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# This script attempts to guess a canonical system name similar to
-+# config.sub.  If it succeeds, it prints the system name on stdout, and
-+# exits with 0.  Otherwise, it exits with 1.
-+#
-+# The plan is that this can be called by configure scripts if you
-+# don't specify an explicit build system type.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION]
-+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit 0 ;;
-+    --version | -v )
-+       echo "$version" ; exit 0 ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit 0 ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help" >&2
-+       exit 1 ;;
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+if test $# != 0; then
-+  echo "$me: too many arguments$help" >&2
-+  exit 1
-+fi
-+
-+trap 'exit 1' 1 2 15
-+
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,)    echo "int x;" > $dummy.c ;
-+	for c in cc gcc c89 c99 ; do
-+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+	     CC_FOR_BUILD="$c"; break ;
-+	  fi ;
-+	done ;
-+	if test x"$CC_FOR_BUILD" = x ; then
-+	  CC_FOR_BUILD=no_compiler_found ;
-+	fi
-+	;;
-+ ,,*)   CC_FOR_BUILD=$CC ;;
-+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-+esac ;'
-+
-+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+# (ghazi@noc.rutgers.edu 1994-08-24)
-+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-+	PATH=$PATH:/.attbin ; export PATH
-+fi
-+
-+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-+
-+# Note: order is significant - the case branches are not exclusive.
-+
-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+    *:NetBSD:*:*)
-+	# NetBSD (nbsd) targets should (where applicable) match one or
-+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-+	# switched to ELF, *-*-netbsd* would select the old
-+	# object file format.  This provides both forward
-+	# compatibility and a consistent mechanism for selecting the
-+	# object file format.
-+	#
-+	# Note: NetBSD doesn't particularly care about the vendor
-+	# portion of the name.  We always set it to "unknown".
-+	sysctl="sysctl -n hw.machine_arch"
-+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    armeb) machine=armeb-unknown ;;
-+	    arm*) machine=arm-unknown ;;
-+	    sh3el) machine=shl-unknown ;;
-+	    sh3eb) machine=sh-unknown ;;
-+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+	esac
-+	# The Operating System including object format, if it has switched
-+	# to ELF recently, or will in the future.
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+		eval $set_cc_for_build
-+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+			| grep __ELF__ >/dev/null
-+		then
-+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+		    # Return netbsd for either.  FIX?
-+		    os=netbsd
-+		else
-+		    os=netbsdelf
-+		fi
-+		;;
-+	    *)
-+	        os=netbsd
-+		;;
-+	esac
-+	# The OS release
-+	# Debian GNU/NetBSD machines have a different userland, and
-+	# thus, need a distinct triplet. However, they do not need
-+	# kernel version information, so it can be replaced with a
-+	# suitable tag, in the style of linux-gnu.
-+	case "${UNAME_VERSION}" in
-+	    Debian*)
-+		release='-gnu'
-+		;;
-+	    *)
-+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		;;
-+	esac
-+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-+	# contains redundant information, the shorter form:
-+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+	echo "${machine}-${os}${release}"
-+	exit 0 ;;
-+    amd64:OpenBSD:*:*)
-+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    amiga:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    arc:OpenBSD:*:*)
-+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    cats:OpenBSD:*:*)
-+	echo arm-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    hp300:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    luna88k:OpenBSD:*:*)
-+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mac68k:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    macppc:OpenBSD:*:*)
-+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvme68k:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvme88k:OpenBSD:*:*)
-+	echo m88k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvmeppc:OpenBSD:*:*)
-+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    pmax:OpenBSD:*:*)
-+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    sgi:OpenBSD:*:*)
-+	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    sun3:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    wgrisc:OpenBSD:*:*)
-+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:OpenBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    macppc:MirBSD:*:*)
-+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    alpha:OSF1:*:*)
-+	case $UNAME_RELEASE in
-+	*4.0)
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
-+	# According to Compaq, /usr/sbin/psrinfo has been available on
-+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-+	# covers most systems running today.  This code pipes the CPU
-+	# types through head -n 1, so we only detect the type of CPU 0.
-+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+	case "$ALPHA_CPU_TYPE" in
-+	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
-+	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
-+	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
-+	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
-+	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
-+	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
-+	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
-+	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
-+	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
-+	esac
-+	# A Pn.n version is a patched version.
-+	# A Vn.n version is a released version.
-+	# A Tn.n version is a released field test version.
-+	# A Xn.n version is an unreleased experimental baselevel.
-+	# 1.2 uses "1.2" for uname -r.
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit 0 ;;
-+    Alpha\ *:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# Should we change UNAME_MACHINE based on the output of uname instead
-+	# of the specific Alpha model?
-+	echo alpha-pc-interix
-+	exit 0 ;;
-+    21064:Windows_NT:50:3)
-+	echo alpha-dec-winnt3.5
-+	exit 0 ;;
-+    Amiga*:UNIX_System_V:4.0:*)
-+	echo m68k-unknown-sysv4
-+	exit 0;;
-+    *:[Aa]miga[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-amigaos
-+	exit 0 ;;
-+    *:[Mm]orph[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-morphos
-+	exit 0 ;;
-+    *:OS/390:*:*)
-+	echo i370-ibm-openedition
-+	exit 0 ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit 0 ;;
-+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+	echo arm-acorn-riscix${UNAME_RELEASE}
-+	exit 0;;
-+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-+	echo hppa1.1-hitachi-hiuxmpp
-+	exit 0;;
-+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+		echo pyramid-pyramid-sysv3
-+	else
-+		echo pyramid-pyramid-bsd
-+	fi
-+	exit 0 ;;
-+    NILE*:*:*:dcosx)
-+	echo pyramid-pyramid-svr4
-+	exit 0 ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit 0 ;;
-+    DRS?6000:UNIX_SV:4.2*:7*)
-+	case `/usr/bin/uname -p` in
-+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	esac ;;
-+    sun4H:SunOS:5.*:*)
-+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
-+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
-+    i86pc:SunOS:5.*:*)
-+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
-+    sun4*:SunOS:6*:*)
-+	# According to config.sub, this is the proper way to canonicalize
-+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-+	# it's likely to be more like Solaris than SunOS4.
-+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
-+    sun4*:SunOS:*:*)
-+	case "`/usr/bin/arch -k`" in
-+	    Series*|S4*)
-+		UNAME_RELEASE=`uname -v`
-+		;;
-+	esac
-+	# Japanese Language versions have a version number like `4.1.3-JL'.
-+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-+	exit 0 ;;
-+    sun3*:SunOS:*:*)
-+	echo m68k-sun-sunos${UNAME_RELEASE}
-+	exit 0 ;;
-+    sun*:*:4.2BSD:*)
-+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+	case "`/bin/arch`" in
-+	    sun3)
-+		echo m68k-sun-sunos${UNAME_RELEASE}
-+		;;
-+	    sun4)
-+		echo sparc-sun-sunos${UNAME_RELEASE}
-+		;;
-+	esac
-+	exit 0 ;;
-+    aushp:SunOS:*:*)
-+	echo sparc-auspex-sunos${UNAME_RELEASE}
-+	exit 0 ;;
-+    # The situation for MiNT is a little confusing.  The machine name
-+    # can be virtually everything (everything which is not
-+    # "atarist" or "atariste" at least should have a processor
-+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-+    # to the lowercase version "mint" (or "freemint").  Finally
-+    # the system name "TOS" denotes a system which is actually not
-+    # MiNT.  But MiNT is downward compatible to TOS, so this should
-+    # be no problem.
-+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit 0 ;;
-+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+	echo m68k-atari-mint${UNAME_RELEASE}
-+        exit 0 ;;
-+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit 0 ;;
-+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+        echo m68k-milan-mint${UNAME_RELEASE}
-+        exit 0 ;;
-+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+        echo m68k-hades-mint${UNAME_RELEASE}
-+        exit 0 ;;
-+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+        echo m68k-unknown-mint${UNAME_RELEASE}
-+        exit 0 ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit 0 ;;
-+    powerpc:machten:*:*)
-+	echo powerpc-apple-machten${UNAME_RELEASE}
-+	exit 0 ;;
-+    RISC*:Mach:*:*)
-+	echo mips-dec-mach_bsd4.3
-+	exit 0 ;;
-+    RISC*:ULTRIX:*:*)
-+	echo mips-dec-ultrix${UNAME_RELEASE}
-+	exit 0 ;;
-+    VAX*:ULTRIX*:*:*)
-+	echo vax-dec-ultrix${UNAME_RELEASE}
-+	exit 0 ;;
-+    2020:CLIX:*:* | 2430:CLIX:*:*)
-+	echo clipper-intergraph-clix${UNAME_RELEASE}
-+	exit 0 ;;
-+    mips:*:*:UMIPS | mips:*:*:RISCos)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h>  /* for printf() prototype */
-+	int main (int argc, char *argv[]) {
-+#else
-+	int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+	#if defined (host_mips) && defined (MIPSEB)
-+	#if defined (SYSTYPE_SYSV)
-+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+	#endif
-+	#if defined (SYSTYPE_SVR4)
-+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+	#endif
-+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+	#endif
-+	#endif
-+	  exit (-1);
-+	}
-+EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c \
-+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+	  && exit 0
-+	echo mips-mips-riscos${UNAME_RELEASE}
-+	exit 0 ;;
-+    Motorola:PowerMAX_OS:*:*)
-+	echo powerpc-motorola-powermax
-+	exit 0 ;;
-+    Motorola:*:4.3:PL8-*)
-+	echo powerpc-harris-powermax
-+	exit 0 ;;
-+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+	echo powerpc-harris-powermax
-+	exit 0 ;;
-+    Night_Hawk:Power_UNIX:*:*)
-+	echo powerpc-harris-powerunix
-+	exit 0 ;;
-+    m88k:CX/UX:7*:*)
-+	echo m88k-harris-cxux7
-+	exit 0 ;;
-+    m88k:*:4*:R4*)
-+	echo m88k-motorola-sysv4
-+	exit 0 ;;
-+    m88k:*:3*:R3*)
-+	echo m88k-motorola-sysv3
-+	exit 0 ;;
-+    AViiON:dgux:*:*)
-+        # DG/UX returns AViiON for all architectures
-+        UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+	then
-+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-+	    then
-+		echo m88k-dg-dgux${UNAME_RELEASE}
-+	    else
-+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+	    fi
-+	else
-+	    echo i586-dg-dgux${UNAME_RELEASE}
-+	fi
-+ 	exit 0 ;;
-+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-+	echo m88k-dolphin-sysv3
-+	exit 0 ;;
-+    M88*:*:R3*:*)
-+	# Delta 88k system running SVR3
-+	echo m88k-motorola-sysv3
-+	exit 0 ;;
-+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-+	echo m88k-tektronix-sysv3
-+	exit 0 ;;
-+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-+	echo m68k-tektronix-bsd
-+	exit 0 ;;
-+    *:IRIX*:*:*)
-+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+	exit 0 ;;
-+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-+	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-+	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-+    i*86:AIX:*:*)
-+	echo i386-ibm-aix
-+	exit 0 ;;
-+    ia64:AIX:*:*)
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+	exit 0 ;;
-+    *:AIX:2:3)
-+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+		eval $set_cc_for_build
-+		sed 's/^		//' << EOF >$dummy.c
-+		#include <sys/systemcfg.h>
-+
-+		main()
-+			{
-+			if (!__power_pc())
-+				exit(1);
-+			puts("powerpc-ibm-aix3.2.5");
-+			exit(0);
-+			}
-+EOF
-+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+		echo rs6000-ibm-aix3.2.5
-+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-+		echo rs6000-ibm-aix3.2.4
-+	else
-+		echo rs6000-ibm-aix3.2
-+	fi
-+	exit 0 ;;
-+    *:AIX:*:[45])
-+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+		IBM_ARCH=rs6000
-+	else
-+		IBM_ARCH=powerpc
-+	fi
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+	exit 0 ;;
-+    *:AIX:*:*)
-+	echo rs6000-ibm-aix
-+	exit 0 ;;
-+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+	echo romp-ibm-bsd4.4
-+	exit 0 ;;
-+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-+	exit 0 ;;                           # report: romp-ibm BSD 4.3
-+    *:BOSX:*:*)
-+	echo rs6000-bull-bosx
-+	exit 0 ;;
-+    DPX/2?00:B.O.S.:*:*)
-+	echo m68k-bull-sysv3
-+	exit 0 ;;
-+    9000/[34]??:4.3bsd:1.*:*)
-+	echo m68k-hp-bsd
-+	exit 0 ;;
-+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-+	echo m68k-hp-bsd4.4
-+	exit 0 ;;
-+    9000/[34678]??:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	case "${UNAME_MACHINE}" in
-+	    9000/31? )            HP_ARCH=m68000 ;;
-+	    9000/[34]?? )         HP_ARCH=m68k ;;
-+	    9000/[678][0-9][0-9])
-+		if [ -x /usr/bin/getconf ]; then
-+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+                    case "${sc_cpu_version}" in
-+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+                      532)                      # CPU_PA_RISC2_0
-+                        case "${sc_kernel_bits}" in
-+                          32) HP_ARCH="hppa2.0n" ;;
-+                          64) HP_ARCH="hppa2.0w" ;;
-+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-+                        esac ;;
-+                    esac
-+		fi
-+		if [ "${HP_ARCH}" = "" ]; then
-+		    eval $set_cc_for_build
-+		    sed 's/^              //' << EOF >$dummy.c
-+
-+              #define _HPUX_SOURCE
-+              #include <stdlib.h>
-+              #include <unistd.h>
-+
-+              int main ()
-+              {
-+              #if defined(_SC_KERNEL_BITS)
-+                  long bits = sysconf(_SC_KERNEL_BITS);
-+              #endif
-+                  long cpu  = sysconf (_SC_CPU_VERSION);
-+
-+                  switch (cpu)
-+              	{
-+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+              	case CPU_PA_RISC2_0:
-+              #if defined(_SC_KERNEL_BITS)
-+              	    switch (bits)
-+              		{
-+              		case 64: puts ("hppa2.0w"); break;
-+              		case 32: puts ("hppa2.0n"); break;
-+              		default: puts ("hppa2.0"); break;
-+              		} break;
-+              #else  /* !defined(_SC_KERNEL_BITS) */
-+              	    puts ("hppa2.0"); break;
-+              #endif
-+              	default: puts ("hppa1.0"); break;
-+              	}
-+                  exit (0);
-+              }
-+EOF
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
-+		fi ;;
-+	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    # avoid double evaluation of $set_cc_for_build
-+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
-+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+	exit 0 ;;
-+    ia64:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	echo ia64-hp-hpux${HPUX_REV}
-+	exit 0 ;;
-+    3050*:HI-UX:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <unistd.h>
-+	int
-+	main ()
-+	{
-+	  long cpu = sysconf (_SC_CPU_VERSION);
-+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-+	     results, however.  */
-+	  if (CPU_IS_PA_RISC (cpu))
-+	    {
-+	      switch (cpu)
-+		{
-+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-+		}
-+	    }
-+	  else if (CPU_IS_HP_MC68K (cpu))
-+	    puts ("m68k-hitachi-hiuxwe2");
-+	  else puts ("unknown-hitachi-hiuxwe2");
-+	  exit (0);
-+	}
-+EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+	echo unknown-hitachi-hiuxwe2
-+	exit 0 ;;
-+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+	echo hppa1.1-hp-bsd
-+	exit 0 ;;
-+    9000/8??:4.3bsd:*:*)
-+	echo hppa1.0-hp-bsd
-+	exit 0 ;;
-+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+	echo hppa1.0-hp-mpeix
-+	exit 0 ;;
-+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+	echo hppa1.1-hp-osf
-+	exit 0 ;;
-+    hp8??:OSF1:*:*)
-+	echo hppa1.0-hp-osf
-+	exit 0 ;;
-+    i*86:OSF1:*:*)
-+	if [ -x /usr/sbin/sysversion ] ; then
-+	    echo ${UNAME_MACHINE}-unknown-osf1mk
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-osf1
-+	fi
-+	exit 0 ;;
-+    parisc*:Lites*:*:*)
-+	echo hppa1.1-hp-lites
-+	exit 0 ;;
-+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-+	echo c1-convex-bsd
-+        exit 0 ;;
-+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+        exit 0 ;;
-+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-+	echo c34-convex-bsd
-+        exit 0 ;;
-+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-+	echo c38-convex-bsd
-+        exit 0 ;;
-+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-+	echo c4-convex-bsd
-+        exit 0 ;;
-+    CRAY*Y-MP:*:*:*)
-+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-+    CRAY*[A-Z]90:*:*:*)
-+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+	      -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-+    CRAY*TS:*:*:*)
-+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-+    CRAY*T3E:*:*:*)
-+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-+    CRAY*SV1:*:*:*)
-+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-+    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+        exit 0 ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit 0 ;;
-+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+	exit 0 ;;
-+    sparc*:BSD/OS:*:*)
-+	echo sparc-unknown-bsdi${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:BSD/OS:*:*)
-+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:FreeBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit 0 ;;
-+    i*:CYGWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-cygwin
-+	exit 0 ;;
-+    i*:MINGW*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw32
-+	exit 0 ;;
-+    i*:PW*:*)
-+	echo ${UNAME_MACHINE}-pc-pw32
-+	exit 0 ;;
-+    x86:Interix*:[34]*)
-+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+	exit 0 ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-pc-mks
-+	exit 0 ;;
-+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-+	# UNAME_MACHINE based on the output of uname instead of i386?
-+	echo i586-pc-interix
-+	exit 0 ;;
-+    i*:UWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-uwin
-+	exit 0 ;;
-+    p*:CYGWIN*:*)
-+	echo powerpcle-unknown-cygwin
-+	exit 0 ;;
-+    prep*:SunOS:5.*:*)
-+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit 0 ;;
-+    *:GNU:*:*)
-+	# the GNU system
-+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+	exit 0 ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit 0 ;;
-+    i*86:Minix:*:*)
-+	echo ${UNAME_MACHINE}-pc-minix
-+	exit 0 ;;
-+    arm*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit 0 ;;
-+    ia64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-+    m68*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-+    mips:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips
-+	#undef mipsel
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mipsel
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips
-+	#else
-+	CPU=
-+	#endif
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	;;
-+    mips64:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips64
-+	#undef mips64el
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mips64el
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips64
-+	#else
-+	CPU=
-+	#endif
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit 0 ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit 0 ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
-+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+	exit 0 ;;
-+    parisc:Linux:*:* | hppa:Linux:*:*)
-+	# Look for CPU level
-+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+	  *)    echo hppa-unknown-linux-gnu ;;
-+	esac
-+	exit 0 ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit 0 ;;
-+    s390:Linux:*:* | s390x:Linux:*:*)
-+	echo ${UNAME_MACHINE}-ibm-linux
-+	exit 0 ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-+    sh*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-+    sparc:Linux:*:* | sparc64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-+    x86_64:Linux:*:*)
-+	echo x86_64-unknown-linux-gnu
-+	exit 0 ;;
-+    i*86:Linux:*:*)
-+	# The BFD linker knows what the default object file format is, so
-+	# first see if it will tell us. cd to the root directory to prevent
-+	# problems with other programs or directories called `ld' in the path.
-+	# Set LC_ALL=C to ensure ld outputs messages in English.
-+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+			 | sed -ne '/supported targets:/!d
-+				    s/[ 	][ 	]*/ /g
-+				    s/.*supported targets: *//
-+				    s/ .*//
-+				    p'`
-+        case "$ld_supported_targets" in
-+	  elf32-i386)
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		;;
-+	  a.out-i386-linux)
-+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		exit 0 ;;
-+	  coff-i386)
-+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+		exit 0 ;;
-+	  "")
-+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-+		# one that does not give us useful --help.
-+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		exit 0 ;;
-+	esac
-+	# Determine whether the default compiler is a.out or elf
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <features.h>
-+	#ifdef __ELF__
-+	# ifdef __GLIBC__
-+	#  if __GLIBC__ >= 2
-+	LIBC=gnu
-+	#  else
-+	LIBC=gnulibc1
-+	#  endif
-+	# else
-+	LIBC=gnulibc1
-+	# endif
-+	#else
-+	#ifdef __INTEL_COMPILER
-+	LIBC=gnu
-+	#else
-+	LIBC=gnuaout
-+	#endif
-+	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-+	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+	;;
-+    i*86:DYNIX/ptx:4*:*)
-+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+	# earlier versions are messed up and put the nodename in both
-+	# sysname and nodename.
-+	echo i386-sequent-sysv4
-+	exit 0 ;;
-+    i*86:UNIX_SV:4.2MP:2.*)
-+        # Unixware is an offshoot of SVR4, but it has its own version
-+        # number series starting with 2...
-+        # I am not positive that other SVR4 systems won't match this,
-+	# I just have to hope.  -- rms.
-+        # Use sysv4.2uw... so that sysv4* matches it.
-+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+	exit 0 ;;
-+    i*86:OS/2:*:*)
-+	# If we were able to find `uname', then EMX Unix compatibility
-+	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit 0 ;;
-+    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
-+	exit 0 ;;
-+    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit 0 ;;
-+	i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit 0 ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit 0 ;;
-+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+	fi
-+	exit 0 ;;
-+    i*86:*:5:[78]*)
-+	case `/bin/uname -X | grep "^Machine"` in
-+	    *486*)	     UNAME_MACHINE=i486 ;;
-+	    *Pentium)	     UNAME_MACHINE=i586 ;;
-+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+	esac
-+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+	exit 0 ;;
-+    i*86:*:3.2:*)
-+	if test -f /usr/options/cb.name; then
-+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-+			&& UNAME_MACHINE=i586
-+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv32
-+	fi
-+	exit 0 ;;
-+    pc:*:*:*)
-+	# Left here for compatibility:
-+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+        # the processor, so we play safe by assuming i386.
-+	echo i386-pc-msdosdjgpp
-+        exit 0 ;;
-+    Intel:Mach:3*:*)
-+	echo i386-pc-mach3
-+	exit 0 ;;
-+    paragon:*:*:*)
-+	echo i860-intel-osf1
-+	exit 0 ;;
-+    i860:*:4.*:*) # i860-SVR4
-+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-+	else # Add other i860-SVR4 vendors below as they are discovered.
-+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-+	fi
-+	exit 0 ;;
-+    mini*:CTIX:SYS*5:*)
-+	# "miniframe"
-+	echo m68010-convergent-sysv
-+	exit 0 ;;
-+    mc68k:UNIX:SYSTEM5:3.51m)
-+	echo m68k-convergent-sysv
-+	exit 0 ;;
-+    M680?0:D-NIX:5.3:*)
-+	echo m68k-diab-dnix
-+	exit 0 ;;
-+    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-+	OS_REL=''
-+	test -r /etc/.relid \
-+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+          && echo i486-ncr-sysv4 && exit 0 ;;
-+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-+	echo m68k-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    mc68030:UNIX_System_V:4.*:*)
-+	echo m68k-atari-sysv4
-+	exit 0 ;;
-+    TSUNAMI:LynxOS:2.*:*)
-+	echo sparc-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    rs6000:LynxOS:2.*:*)
-+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    SM[BE]S:UNIX_SV:*:*)
-+	echo mips-dde-sysv${UNAME_RELEASE}
-+	exit 0 ;;
-+    RM*:ReliantUNIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit 0 ;;
-+    RM*:SINIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit 0 ;;
-+    *:SINIX-*:*:*)
-+	if uname -p 2>/dev/null >/dev/null ; then
-+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+		echo ${UNAME_MACHINE}-sni-sysv4
-+	else
-+		echo ns32k-sni-sysv
-+	fi
-+	exit 0 ;;
-+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-+        echo i586-unisys-sysv4
-+        exit 0 ;;
-+    *:UNIX_System_V:4*:FTX*)
-+	# From Gerald Hewes <hewes@openmarket.com>.
-+	# How about differentiating between stratus architectures? -djm
-+	echo hppa1.1-stratus-sysv4
-+	exit 0 ;;
-+    *:*:*:FTX*)
-+	# From seanf@swdc.stratus.com.
-+	echo i860-stratus-sysv4
-+	exit 0 ;;
-+    *:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo hppa1.1-stratus-vos
-+	exit 0 ;;
-+    mc68*:A/UX:*:*)
-+	echo m68k-apple-aux${UNAME_RELEASE}
-+	exit 0 ;;
-+    news*:NEWS-OS:6*:*)
-+	echo mips-sony-newsos6
-+	exit 0 ;;
-+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-+	if [ -d /usr/nec ]; then
-+	        echo mips-nec-sysv${UNAME_RELEASE}
-+	else
-+	        echo mips-unknown-sysv${UNAME_RELEASE}
-+	fi
-+        exit 0 ;;
-+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-+	echo powerpc-be-beos
-+	exit 0 ;;
-+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-+	echo powerpc-apple-beos
-+	exit 0 ;;
-+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-+	echo i586-pc-beos
-+	exit 0 ;;
-+    SX-4:SUPER-UX:*:*)
-+	echo sx4-nec-superux${UNAME_RELEASE}
-+	exit 0 ;;
-+    SX-5:SUPER-UX:*:*)
-+	echo sx5-nec-superux${UNAME_RELEASE}
-+	exit 0 ;;
-+    SX-6:SUPER-UX:*:*)
-+	echo sx6-nec-superux${UNAME_RELEASE}
-+	exit 0 ;;
-+    Power*:Rhapsody:*:*)
-+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:Rhapsody:*:*)
-+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:Darwin:*:*)
-+	case `uname -p` in
-+	    *86) UNAME_PROCESSOR=i686 ;;
-+	    powerpc) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+	UNAME_PROCESSOR=`uname -p`
-+	if test "$UNAME_PROCESSOR" = "x86"; then
-+		UNAME_PROCESSOR=i386
-+		UNAME_MACHINE=pc
-+	fi
-+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:QNX:*:4*)
-+	echo i386-pc-qnx
-+	exit 0 ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
-+	echo nsr-tandem-nsk${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:NonStop-UX:*:*)
-+	echo mips-compaq-nonstopux
-+	exit 0 ;;
-+    BS2000:POSIX*:*:*)
-+	echo bs2000-siemens-sysv
-+	exit 0 ;;
-+    DS/*:UNIX_System_V:*:*)
-+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:Plan9:*:*)
-+	# "uname -m" is not consistent, so use $cputype instead. 386
-+	# is converted to i386 for consistency with other x86
-+	# operating systems.
-+	if test "$cputype" = "386"; then
-+	    UNAME_MACHINE=i386
-+	else
-+	    UNAME_MACHINE="$cputype"
-+	fi
-+	echo ${UNAME_MACHINE}-unknown-plan9
-+	exit 0 ;;
-+    *:TOPS-10:*:*)
-+	echo pdp10-unknown-tops10
-+	exit 0 ;;
-+    *:TENEX:*:*)
-+	echo pdp10-unknown-tenex
-+	exit 0 ;;
-+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+	echo pdp10-dec-tops20
-+	exit 0 ;;
-+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+	echo pdp10-xkl-tops20
-+	exit 0 ;;
-+    *:TOPS-20:*:*)
-+	echo pdp10-unknown-tops20
-+	exit 0 ;;
-+    *:ITS:*:*)
-+	echo pdp10-unknown-its
-+	exit 0 ;;
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit 0 ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms && exit 0 ;;
-+	    I*) echo ia64-dec-vms && exit 0 ;;
-+	    V*) echo vax-dec-vms && exit 0 ;;
-+	esac
-+esac
-+
-+#echo '(No uname command or uname output not recognized.)' 1>&2
-+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-+
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
-+#ifdef _SEQUENT_
-+# include <sys/types.h>
-+# include <sys/utsname.h>
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-+     I don't know....  */
-+  printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+  printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+          "4"
-+#else
-+	  ""
-+#endif
-+         ); exit (0);
-+#endif
-+#endif
-+
-+#if defined (__arm) && defined (__acorn) && defined (__unix)
-+  printf ("arm-acorn-riscix"); exit (0);
-+#endif
-+
-+#if defined (hp300) && !defined (hpux)
-+  printf ("m68k-hp-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+  int version;
-+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-+  if (version < 4)
-+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+  else
-+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+  exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+  printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+  printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+  printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+  printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+  printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+  printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+    struct utsname un;
-+
-+    uname(&un);
-+
-+    if (strncmp(un.version, "V2", 2) == 0) {
-+	printf ("i386-sequent-ptx2\n"); exit (0);
-+    }
-+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+	printf ("i386-sequent-ptx1\n"); exit (0);
-+    }
-+    printf ("i386-sequent-ptx\n"); exit (0);
-+
-+#endif
-+
-+#if defined (vax)
-+# if !defined (ultrix)
-+#  include <sys/param.h>
-+#  if defined (BSD)
-+#   if BSD == 43
-+      printf ("vax-dec-bsd4.3\n"); exit (0);
-+#   else
-+#    if BSD == 199006
-+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+#    else
-+      printf ("vax-dec-bsd\n"); exit (0);
-+#    endif
-+#   endif
-+#  else
-+    printf ("vax-dec-bsd\n"); exit (0);
-+#  endif
-+# else
-+    printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
-+#endif
-+
-+#if defined (alliant) && defined (i860)
-+  printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
-+
-+  exit (1);
-+}
-+EOF
-+
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+
-+# Convex versions that predate uname can use getsysinfo(1)
-+
-+if [ -x /usr/convex/getsysinfo ]
-+then
-+    case `getsysinfo -f cpu_type` in
-+    c1*)
-+	echo c1-convex-bsd
-+	exit 0 ;;
-+    c2*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+	exit 0 ;;
-+    c34*)
-+	echo c34-convex-bsd
-+	exit 0 ;;
-+    c38*)
-+	echo c38-convex-bsd
-+	exit 0 ;;
-+    c4*)
-+	echo c4-convex-bsd
-+	exit 0 ;;
-+    esac
-+fi
-+
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
-+
-+    ftp://ftp.gnu.org/pub/gnu/config/
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches@gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo               = `(hostinfo) 2>/dev/null`
-+/bin/universe          = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch              = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM  = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-+
-+exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff -Nrua kdenetwork-3.4.0.orig/admin/config.sub kdenetwork-3.4.0/admin/config.sub
---- kdenetwork-3.4.0.orig/admin/config.sub	2004-08-02 14:17:40.000000000 +0000
-+++ kdenetwork-3.4.0/admin/config.sub	2005-03-05 23:23:54.159392480 +0000
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
- 
--timestamp='2004-06-24'
-+timestamp='2004-11-30'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -267,7 +267,7 @@
- 	| tahoe | thumb | tic4x | tic80 | tron \
- 	| v850 | v850e \
- 	| we32k \
--	| x86 | xscale | xstormy16 | xtensa \
-+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
- 	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
-@@ -343,8 +343,8 @@
- 	| tron-* \
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
--	| xtensa-* \
-+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa-* \
- 	| ymp-* \
- 	| z8k-*)
- 		;;
-@@ -457,6 +457,9 @@
- 	crds | unos)
- 		basic_machine=m68k-crds
- 		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
- 	cris | cris-* | etrax*)
- 		basic_machine=cris-axis
- 		;;
-@@ -486,6 +489,10 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
- 	dpx20 | dpx20-*)
- 		basic_machine=rs6000-bull
- 		os=-bosx
-@@ -1026,6 +1033,10 @@
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
-+		;;
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-@@ -1294,6 +1305,9 @@
- 	-kaos*)
- 		os=-kaos
- 		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
- 	-none)
- 		;;
- 	*)
-diff -Nrua kdenetwork-3.4.0.orig/admin/config.sub.cdbs-orig kdenetwork-3.4.0/admin/config.sub.cdbs-orig
---- kdenetwork-3.4.0.orig/admin/config.sub.cdbs-orig	1970-01-01 00:00:00.000000000 +0000
-+++ kdenetwork-3.4.0/admin/config.sub.cdbs-orig	2004-08-02 14:17:40.000000000 +0000
-@@ -0,0 +1,1552 @@
-+#! /bin/sh
-+# Configuration validation subroutine script.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+
-+timestamp='2004-06-24'
-+
-+# This file is (in principle) common to ALL GNU software.
-+# The presence of a machine in this file suggests that SOME GNU software
-+# can handle that machine.  It does not imply ALL GNU software can.
-+#
-+# This file is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330,
-+# Boston, MA 02111-1307, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# Configuration subroutine to validate and canonicalize a configuration type.
-+# Supply the specified configuration type as an argument.
-+# If it is invalid, we print an error message on stderr and exit with code 1.
-+# Otherwise, we print the canonical config type on stdout and succeed.
-+
-+# This file is supposed to be the same for all GNU packages
-+# and recognize all the CPU types, system types and aliases
-+# that are meaningful with *any* GNU software.
-+# Each package is responsible for reporting which valid configurations
-+# it does not support.  The user should be able to distinguish
-+# a failure to support a valid configuration from a meaningless
-+# configuration.
-+
-+# The goal of this file is to map all the various variations of a given
-+# machine specification into a single specification in the form:
-+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or in some cases, the newer four-part form:
-+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# It is wrong to echo any other type of specification.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+       $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit 0 ;;
-+    --version | -v )
-+       echo "$version" ; exit 0 ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit 0 ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help"
-+       exit 1 ;;
-+
-+    *local*)
-+       # First pass through any local machine types.
-+       echo $1
-+       exit 0;;
-+
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+    exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+    exit 1;;
-+esac
-+
-+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-+# Here we must recognize all the valid KERNEL-OS combinations.
-+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-+case $maybe_os in
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+    os=-$maybe_os
-+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-+    ;;
-+  *)
-+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-+    if [ $basic_machine != $1 ]
-+    then os=`echo $1 | sed 's/.*-/-/'`
-+    else os=; fi
-+    ;;
-+esac
-+
-+### Let's recognize common machines as not being operating systems so
-+### that things like config.sub decstation-3100 work.  We also
-+### recognize some manufacturers as not being operating systems, so we
-+### can provide default operating systems below.
-+case $os in
-+	-sun*os*)
-+		# Prevent following clause from handling this invalid input.
-+		;;
-+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-+	-apple | -axis | -knuth | -cray)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-sim | -cisco | -oki | -wec | -winbond)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-scout)
-+		;;
-+	-wrs)
-+		os=-vxworks
-+		basic_machine=$1
-+		;;
-+	-chorusos*)
-+		os=-chorusos
-+		basic_machine=$1
-+		;;
-+ 	-chorusrdb)
-+ 		os=-chorusrdb
-+		basic_machine=$1
-+ 		;;
-+	-hiux*)
-+		os=-hiuxwe2
-+		;;
-+	-sco5)
-+		os=-sco3.2v5
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco4)
-+		os=-sco3.2v4
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco3.2.[4-9]*)
-+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco3.2v[4-9]*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco*)
-+		os=-sco3.2v2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-udk*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-isc)
-+		os=-isc2.2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-clix*)
-+		basic_machine=clipper-intergraph
-+		;;
-+	-isc*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-lynx*)
-+		os=-lynxos
-+		;;
-+	-ptx*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-+		;;
-+	-windowsnt*)
-+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+		;;
-+	-psos*)
-+		os=-psos
-+		;;
-+	-mint | -mint[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+esac
-+
-+# Decode aliases for certain CPU-COMPANY combinations.
-+case $basic_machine in
-+	# Recognize the basic CPU types without company name.
-+	# Some are omitted here because they have special meanings below.
-+	1750a | 580 \
-+	| a29k \
-+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+	| am33_2.0 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+	| c4x | clipper \
-+	| d10v | d30v | dlx | dsp16xx \
-+	| fr30 | frv \
-+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| i370 | i860 | i960 | ia64 \
-+	| ip2k | iq2000 \
-+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
-+	| mips | mipsbe | mipseb | mipsel | mipsle \
-+	| mips16 \
-+	| mips64 | mips64el \
-+	| mips64vr | mips64vrel \
-+	| mips64orion | mips64orionel \
-+	| mips64vr4100 | mips64vr4100el \
-+	| mips64vr4300 | mips64vr4300el \
-+	| mips64vr5000 | mips64vr5000el \
-+	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64sb1 | mipsisa64sb1el \
-+	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipstx39 | mipstx39el \
-+	| mn10200 | mn10300 \
-+	| msp430 \
-+	| ns16k | ns32k \
-+	| openrisc | or32 \
-+	| pdp10 | pdp11 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| pyramid \
-+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh64 | sh64le \
-+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-+	| strongarm \
-+	| tahoe | thumb | tic4x | tic80 | tron \
-+	| v850 | v850e \
-+	| we32k \
-+	| x86 | xscale | xstormy16 | xtensa \
-+	| z8k)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12)
-+		# Motorola 68HC11/12.
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+		;;
-+
-+	# We use `pc' rather than `unknown'
-+	# because (1) that's what they normally are, and
-+	# (2) the word "unknown" tends to confuse beginning users.
-+	i*86 | x86_64)
-+	  basic_machine=$basic_machine-pc
-+	  ;;
-+	# Object if more than one company name word.
-+	*-*-*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		exit 1
-+		;;
-+	# Recognize the basic CPU types with company name.
-+	580-* \
-+	| a29k-* \
-+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| avr-* \
-+	| bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| clipper-* | craynv-* | cydra-* \
-+	| d10v-* | d30v-* | dlx-* \
-+	| elxsi-* \
-+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| h8300-* | h8500-* \
-+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| i*86-* | i860-* | i960-* | ia64-* \
-+	| ip2k-* | iq2000-* \
-+	| m32r-* | m32rle-* \
-+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+	| m88110-* | m88k-* | mcore-* \
-+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+	| mips16-* \
-+	| mips64-* | mips64el-* \
-+	| mips64vr-* | mips64vrel-* \
-+	| mips64orion-* | mips64orionel-* \
-+	| mips64vr4100-* | mips64vr4100el-* \
-+	| mips64vr4300-* | mips64vr4300el-* \
-+	| mips64vr5000-* | mips64vr5000el-* \
-+	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64sb1-* | mipsisa64sb1el-* \
-+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| msp430-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| orion-* \
-+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| pyramid-* \
-+	| romp-* | rs6000-* \
-+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tron-* \
-+	| v850-* | v850e-* | vax-* \
-+	| we32k-* \
-+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-+	| xtensa-* \
-+	| ymp-* \
-+	| z8k-*)
-+		;;
-+	# Recognize the various machine names and aliases which stand
-+	# for a CPU type and a company and sometimes even an OS.
-+	386bsd)
-+		basic_machine=i386-unknown
-+		os=-bsd
-+		;;
-+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-+		basic_machine=m68000-att
-+		;;
-+	3b*)
-+		basic_machine=we32k-att
-+		;;
-+	a29khif)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
-+	adobe68k)
-+		basic_machine=m68010-adobe
-+		os=-scout
-+		;;
-+	alliant | fx80)
-+		basic_machine=fx80-alliant
-+		;;
-+	altos | altos3068)
-+		basic_machine=m68k-altos
-+		;;
-+	am29k)
-+		basic_machine=a29k-none
-+		os=-bsd
-+		;;
-+	amd64)
-+		basic_machine=x86_64-pc
-+		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	amdahl)
-+		basic_machine=580-amdahl
-+		os=-sysv
-+		;;
-+	amiga | amiga-*)
-+		basic_machine=m68k-unknown
-+		;;
-+	amigaos | amigados)
-+		basic_machine=m68k-unknown
-+		os=-amigaos
-+		;;
-+	amigaunix | amix)
-+		basic_machine=m68k-unknown
-+		os=-sysv4
-+		;;
-+	apollo68)
-+		basic_machine=m68k-apollo
-+		os=-sysv
-+		;;
-+	apollo68bsd)
-+		basic_machine=m68k-apollo
-+		os=-bsd
-+		;;
-+	aux)
-+		basic_machine=m68k-apple
-+		os=-aux
-+		;;
-+	balance)
-+		basic_machine=ns32k-sequent
-+		os=-dynix
-+		;;
-+	c90)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
-+	convex-c1)
-+		basic_machine=c1-convex
-+		os=-bsd
-+		;;
-+	convex-c2)
-+		basic_machine=c2-convex
-+		os=-bsd
-+		;;
-+	convex-c32)
-+		basic_machine=c32-convex
-+		os=-bsd
-+		;;
-+	convex-c34)
-+		basic_machine=c34-convex
-+		os=-bsd
-+		;;
-+	convex-c38)
-+		basic_machine=c38-convex
-+		os=-bsd
-+		;;
-+	cray | j90)
-+		basic_machine=j90-cray
-+		os=-unicos
-+		;;
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
-+		;;
-+	cr16c)
-+		basic_machine=cr16c-unknown
-+		os=-elf
-+		;;
-+	crds | unos)
-+		basic_machine=m68k-crds
-+		;;
-+	cris | cris-* | etrax*)
-+		basic_machine=cris-axis
-+		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
-+	da30 | da30-*)
-+		basic_machine=m68k-da30
-+		;;
-+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-+		basic_machine=mips-dec
-+		;;
-+	decsystem10* | dec10*)
-+		basic_machine=pdp10-dec
-+		os=-tops10
-+		;;
-+	decsystem20* | dec20*)
-+		basic_machine=pdp10-dec
-+		os=-tops20
-+		;;
-+	delta | 3300 | motorola-3300 | motorola-delta \
-+	      | 3300-motorola | delta-motorola)
-+		basic_machine=m68k-motorola
-+		;;
-+	delta88)
-+		basic_machine=m88k-motorola
-+		os=-sysv3
-+		;;
-+	dpx20 | dpx20-*)
-+		basic_machine=rs6000-bull
-+		os=-bosx
-+		;;
-+	dpx2* | dpx2*-bull)
-+		basic_machine=m68k-bull
-+		os=-sysv3
-+		;;
-+	ebmon29k)
-+		basic_machine=a29k-amd
-+		os=-ebmon
-+		;;
-+	elxsi)
-+		basic_machine=elxsi-elxsi
-+		os=-bsd
-+		;;
-+	encore | umax | mmax)
-+		basic_machine=ns32k-encore
-+		;;
-+	es1800 | OSE68k | ose68k | ose | OSE)
-+		basic_machine=m68k-ericsson
-+		os=-ose
-+		;;
-+	fx2800)
-+		basic_machine=i860-alliant
-+		;;
-+	genix)
-+		basic_machine=ns32k-ns
-+		;;
-+	gmicro)
-+		basic_machine=tron-gmicro
-+		os=-sysv
-+		;;
-+	go32)
-+		basic_machine=i386-pc
-+		os=-go32
-+		;;
-+	h3050r* | hiux*)
-+		basic_machine=hppa1.1-hitachi
-+		os=-hiuxwe2
-+		;;
-+	h8300hms)
-+		basic_machine=h8300-hitachi
-+		os=-hms
-+		;;
-+	h8300xray)
-+		basic_machine=h8300-hitachi
-+		os=-xray
-+		;;
-+	h8500hms)
-+		basic_machine=h8500-hitachi
-+		os=-hms
-+		;;
-+	harris)
-+		basic_machine=m88k-harris
-+		os=-sysv3
-+		;;
-+	hp300-*)
-+		basic_machine=m68k-hp
-+		;;
-+	hp300bsd)
-+		basic_machine=m68k-hp
-+		os=-bsd
-+		;;
-+	hp300hpux)
-+		basic_machine=m68k-hp
-+		os=-hpux
-+		;;
-+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k2[0-9][0-9] | hp9k31[0-9])
-+		basic_machine=m68000-hp
-+		;;
-+	hp9k3[2-9][0-9])
-+		basic_machine=m68k-hp
-+		;;
-+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k78[0-9] | hp78[0-9])
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][13679] | hp8[0-9][13679])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hppa-next)
-+		os=-nextstep3
-+		;;
-+	hppaosf)
-+		basic_machine=hppa1.1-hp
-+		os=-osf
-+		;;
-+	hppro)
-+		basic_machine=hppa1.1-hp
-+		os=-proelf
-+		;;
-+	i370-ibm* | ibm*)
-+		basic_machine=i370-ibm
-+		;;
-+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-+	i*86v32)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv32
-+		;;
-+	i*86v4*)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv4
-+		;;
-+	i*86v)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv
-+		;;
-+	i*86sol2)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-solaris2
-+		;;
-+	i386mach)
-+		basic_machine=i386-mach
-+		os=-mach
-+		;;
-+	i386-vsta | vsta)
-+		basic_machine=i386-unknown
-+		os=-vsta
-+		;;
-+	iris | iris4d)
-+		basic_machine=mips-sgi
-+		case $os in
-+		    -irix*)
-+			;;
-+		    *)
-+			os=-irix4
-+			;;
-+		esac
-+		;;
-+	isi68 | isi)
-+		basic_machine=m68k-isi
-+		os=-sysv
-+		;;
-+	m88k-omron*)
-+		basic_machine=m88k-omron
-+		;;
-+	magnum | m3230)
-+		basic_machine=mips-mips
-+		os=-sysv
-+		;;
-+	merlin)
-+		basic_machine=ns32k-utek
-+		os=-sysv
-+		;;
-+	mingw32)
-+		basic_machine=i386-pc
-+		os=-mingw32
-+		;;
-+	miniframe)
-+		basic_machine=m68000-convergent
-+		;;
-+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+	mips3*-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+		;;
-+	mips3*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+		;;
-+	monitor)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	morphos)
-+		basic_machine=powerpc-unknown
-+		os=-morphos
-+		;;
-+	msdos)
-+		basic_machine=i386-pc
-+		os=-msdos
-+		;;
-+	mvs)
-+		basic_machine=i370-ibm
-+		os=-mvs
-+		;;
-+	ncr3000)
-+		basic_machine=i486-ncr
-+		os=-sysv4
-+		;;
-+	netbsd386)
-+		basic_machine=i386-unknown
-+		os=-netbsd
-+		;;
-+	netwinder)
-+		basic_machine=armv4l-rebel
-+		os=-linux
-+		;;
-+	news | news700 | news800 | news900)
-+		basic_machine=m68k-sony
-+		os=-newsos
-+		;;
-+	news1000)
-+		basic_machine=m68030-sony
-+		os=-newsos
-+		;;
-+	news-3600 | risc-news)
-+		basic_machine=mips-sony
-+		os=-newsos
-+		;;
-+	necv70)
-+		basic_machine=v70-nec
-+		os=-sysv
-+		;;
-+	next | m*-next )
-+		basic_machine=m68k-next
-+		case $os in
-+		    -nextstep* )
-+			;;
-+		    -ns2*)
-+		      os=-nextstep2
-+			;;
-+		    *)
-+		      os=-nextstep3
-+			;;
-+		esac
-+		;;
-+	nh3000)
-+		basic_machine=m68k-harris
-+		os=-cxux
-+		;;
-+	nh[45]000)
-+		basic_machine=m88k-harris
-+		os=-cxux
-+		;;
-+	nindy960)
-+		basic_machine=i960-intel
-+		os=-nindy
-+		;;
-+	mon960)
-+		basic_machine=i960-intel
-+		os=-mon960
-+		;;
-+	nonstopux)
-+		basic_machine=mips-compaq
-+		os=-nonstopux
-+		;;
-+	np1)
-+		basic_machine=np1-gould
-+		;;
-+	nsr-tandem)
-+		basic_machine=nsr-tandem
-+		;;
-+	op50n-* | op60c-*)
-+		basic_machine=hppa1.1-oki
-+		os=-proelf
-+		;;
-+	or32 | or32-*)
-+		basic_machine=or32-unknown
-+		os=-coff
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
-+		;;
-+	OSE68000 | ose68000)
-+		basic_machine=m68000-ericsson
-+		os=-ose
-+		;;
-+	os68k)
-+		basic_machine=m68k-none
-+		os=-os68k
-+		;;
-+	pa-hitachi)
-+		basic_machine=hppa1.1-hitachi
-+		os=-hiuxwe2
-+		;;
-+	paragon)
-+		basic_machine=i860-intel
-+		os=-osf
-+		;;
-+	pbd)
-+		basic_machine=sparc-tti
-+		;;
-+	pbb)
-+		basic_machine=m68k-tti
-+		;;
-+	pc532 | pc532-*)
-+		basic_machine=ns32k-pc532
-+		;;
-+	pentium | p5 | k5 | k6 | nexgen | viac3)
-+		basic_machine=i586-pc
-+		;;
-+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-+		basic_machine=i686-pc
-+		;;
-+	pentiumii | pentium2 | pentiumiii | pentium3)
-+		basic_machine=i686-pc
-+		;;
-+	pentium4)
-+		basic_machine=i786-pc
-+		;;
-+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pn)
-+		basic_machine=pn-gould
-+		;;
-+	power)	basic_machine=power-ibm
-+		;;
-+	ppc)	basic_machine=powerpc-unknown
-+		;;
-+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppcle | powerpclittle | ppc-le | powerpc-little)
-+		basic_machine=powerpcle-unknown
-+		;;
-+	ppcle-* | powerpclittle-*)
-+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64)	basic_machine=powerpc64-unknown
-+		;;
-+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+		basic_machine=powerpc64le-unknown
-+		;;
-+	ppc64le-* | powerpc64little-*)
-+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ps2)
-+		basic_machine=i386-ibm
-+		;;
-+	pw32)
-+		basic_machine=i586-unknown
-+		os=-pw32
-+		;;
-+	rom68k)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	rm[46]00)
-+		basic_machine=mips-siemens
-+		;;
-+	rtpc | rtpc-*)
-+		basic_machine=romp-ibm
-+		;;
-+	s390 | s390-*)
-+		basic_machine=s390-ibm
-+		;;
-+	s390x | s390x-*)
-+		basic_machine=s390x-ibm
-+		;;
-+	sa29200)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	sb1)
-+		basic_machine=mipsisa64sb1-unknown
-+		;;
-+	sb1el)
-+		basic_machine=mipsisa64sb1el-unknown
-+		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
-+	sequent)
-+		basic_machine=i386-sequent
-+		;;
-+	sh)
-+		basic_machine=sh-hitachi
-+		os=-hms
-+		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparclite-wrs | simso-wrs)
-+		basic_machine=sparclite-wrs
-+		os=-vxworks
-+		;;
-+	sps7)
-+		basic_machine=m68k-bull
-+		os=-sysv2
-+		;;
-+	spur)
-+		basic_machine=spur-unknown
-+		;;
-+	st2000)
-+		basic_machine=m68k-tandem
-+		;;
-+	stratus)
-+		basic_machine=i860-stratus
-+		os=-sysv4
-+		;;
-+	sun2)
-+		basic_machine=m68000-sun
-+		;;
-+	sun2os3)
-+		basic_machine=m68000-sun
-+		os=-sunos3
-+		;;
-+	sun2os4)
-+		basic_machine=m68000-sun
-+		os=-sunos4
-+		;;
-+	sun3os3)
-+		basic_machine=m68k-sun
-+		os=-sunos3
-+		;;
-+	sun3os4)
-+		basic_machine=m68k-sun
-+		os=-sunos4
-+		;;
-+	sun4os3)
-+		basic_machine=sparc-sun
-+		os=-sunos3
-+		;;
-+	sun4os4)
-+		basic_machine=sparc-sun
-+		os=-sunos4
-+		;;
-+	sun4sol2)
-+		basic_machine=sparc-sun
-+		os=-solaris2
-+		;;
-+	sun3 | sun3-*)
-+		basic_machine=m68k-sun
-+		;;
-+	sun4)
-+		basic_machine=sparc-sun
-+		;;
-+	sun386 | sun386i | roadrunner)
-+		basic_machine=i386-sun
-+		;;
-+	sv1)
-+		basic_machine=sv1-cray
-+		os=-unicos
-+		;;
-+	symmetry)
-+		basic_machine=i386-sequent
-+		os=-dynix
-+		;;
-+	t3e)
-+		basic_machine=alphaev5-cray
-+		os=-unicos
-+		;;
-+	t90)
-+		basic_machine=t90-cray
-+		os=-unicos
-+		;;
-+	tic54x | c54x*)
-+		basic_machine=tic54x-unknown
-+		os=-coff
-+		;;
-+	tic55x | c55x*)
-+		basic_machine=tic55x-unknown
-+		os=-coff
-+		;;
-+	tic6x | c6x*)
-+		basic_machine=tic6x-unknown
-+		os=-coff
-+		;;
-+	tx39)
-+		basic_machine=mipstx39-unknown
-+		;;
-+	tx39el)
-+		basic_machine=mipstx39el-unknown
-+		;;
-+	toad1)
-+		basic_machine=pdp10-xkl
-+		os=-tops20
-+		;;
-+	tower | tower-32)
-+		basic_machine=m68k-ncr
-+		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
-+	udi29k)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	ultra3)
-+		basic_machine=a29k-nyu
-+		os=-sym1
-+		;;
-+	v810 | necv810)
-+		basic_machine=v810-nec
-+		os=-none
-+		;;
-+	vaxv)
-+		basic_machine=vax-dec
-+		os=-sysv
-+		;;
-+	vms)
-+		basic_machine=vax-dec
-+		os=-vms
-+		;;
-+	vpp*|vx|vx-*)
-+		basic_machine=f301-fujitsu
-+		;;
-+	vxworks960)
-+		basic_machine=i960-wrs
-+		os=-vxworks
-+		;;
-+	vxworks68)
-+		basic_machine=m68k-wrs
-+		os=-vxworks
-+		;;
-+	vxworks29k)
-+		basic_machine=a29k-wrs
-+		os=-vxworks
-+		;;
-+	w65*)
-+		basic_machine=w65-wdc
-+		os=-none
-+		;;
-+	w89k-*)
-+		basic_machine=hppa1.1-winbond
-+		os=-proelf
-+		;;
-+	xps | xps100)
-+		basic_machine=xps100-honeywell
-+		;;
-+	ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
-+	z8k-*-coff)
-+		basic_machine=z8k-unknown
-+		os=-sim
-+		;;
-+	none)
-+		basic_machine=none-none
-+		os=-none
-+		;;
-+
-+# Here we handle the default manufacturer of certain CPU types.  It is in
-+# some cases the only manufacturer, in others, it is the most popular.
-+	w89k)
-+		basic_machine=hppa1.1-winbond
-+		;;
-+	op50n)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	op60c)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	romp)
-+		basic_machine=romp-ibm
-+		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
-+	rs6000)
-+		basic_machine=rs6000-ibm
-+		;;
-+	vax)
-+		basic_machine=vax-dec
-+		;;
-+	pdp10)
-+		# there are many clones, so DEC is not a safe bet
-+		basic_machine=pdp10-unknown
-+		;;
-+	pdp11)
-+		basic_machine=pdp11-dec
-+		;;
-+	we32k)
-+		basic_machine=we32k-att
-+		;;
-+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+		basic_machine=sh-unknown
-+		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparc | sparcv8 | sparcv9 | sparcv9b)
-+		basic_machine=sparc-sun
-+		;;
-+	cydra)
-+		basic_machine=cydra-cydrome
-+		;;
-+	orion)
-+		basic_machine=orion-highlevel
-+		;;
-+	orion105)
-+		basic_machine=clipper-highlevel
-+		;;
-+	mac | mpw | mac-mpw)
-+		basic_machine=m68k-apple
-+		;;
-+	pmac | pmac-mpw)
-+		basic_machine=powerpc-apple
-+		;;
-+	*-unknown)
-+		# Make sure to match an already-canonicalized machine name.
-+		;;
-+	*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		exit 1
-+		;;
-+esac
-+
-+# Here we canonicalize certain aliases for manufacturers.
-+case $basic_machine in
-+	*-digital*)
-+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+		;;
-+	*-commodore*)
-+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+		;;
-+	*)
-+		;;
-+esac
-+
-+# Decode manufacturer-specific aliases for certain operating systems.
-+
-+if [ x"$os" != x"" ]
-+then
-+case $os in
-+        # First match some system type aliases
-+        # that might get confused with valid system types.
-+	# -solaris* is a basic system type, with this one exception.
-+	-solaris1 | -solaris1.*)
-+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-+		;;
-+	-solaris)
-+		os=-solaris2
-+		;;
-+	-svr4*)
-+		os=-sysv4
-+		;;
-+	-unixware*)
-+		os=-sysv4.2uw
-+		;;
-+	-gnu/linux*)
-+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-+		;;
-+	# First accept the basic system types.
-+	# The portable systems comes first.
-+	# Each alternative MUST END IN A *, to match a version number.
-+	# -sysv* is not here because it comes later, after sysvr4.
-+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+	      | -aos* \
-+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -chorusos* | -chorusrdb* \
-+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-+	# Remember, each alternative MUST END IN *, to match a version number.
-+		;;
-+	-qnx*)
-+		case $basic_machine in
-+		    x86-* | i*86-*)
-+			;;
-+		    *)
-+			os=-nto$os
-+			;;
-+		esac
-+		;;
-+	-nto-qnx*)
-+		;;
-+	-nto*)
-+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+		;;
-+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+		;;
-+	-mac*)
-+		os=`echo $os | sed -e 's|mac|macos|'`
-+		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
-+	-linux*)
-+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-+		;;
-+	-sunos5*)
-+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+		;;
-+	-sunos6*)
-+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+		;;
-+	-opened*)
-+		os=-openedition
-+		;;
-+        -os400*)
-+		os=-os400
-+		;;
-+	-wince*)
-+		os=-wince
-+		;;
-+	-osfrose*)
-+		os=-osfrose
-+		;;
-+	-osf*)
-+		os=-osf
-+		;;
-+	-utek*)
-+		os=-bsd
-+		;;
-+	-dynix*)
-+		os=-bsd
-+		;;
-+	-acis*)
-+		os=-aos
-+		;;
-+	-atheos*)
-+		os=-atheos
-+		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
-+	-386bsd)
-+		os=-bsd
-+		;;
-+	-ctix* | -uts*)
-+		os=-sysv
-+		;;
-+	-nova*)
-+		os=-rtmk-nova
-+		;;
-+	-ns2 )
-+		os=-nextstep2
-+		;;
-+	-nsk*)
-+		os=-nsk
-+		;;
-+	# Preserve the version number of sinix5.
-+	-sinix5.*)
-+		os=`echo $os | sed -e 's|sinix|sysv|'`
-+		;;
-+	-sinix*)
-+		os=-sysv4
-+		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
-+	-triton*)
-+		os=-sysv3
-+		;;
-+	-oss*)
-+		os=-sysv3
-+		;;
-+	-svr4)
-+		os=-sysv4
-+		;;
-+	-svr3)
-+		os=-sysv3
-+		;;
-+	-sysvr4)
-+		os=-sysv4
-+		;;
-+	# This must come after -sysvr4.
-+	-sysv*)
-+		;;
-+	-ose*)
-+		os=-ose
-+		;;
-+	-es1800*)
-+		os=-ose
-+		;;
-+	-xenix)
-+		os=-xenix
-+		;;
-+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+		os=-mint
-+		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-none)
-+		;;
-+	*)
-+		# Get rid of the `-' at the beginning of $os.
-+		os=`echo $os | sed 's/[^-]*-//'`
-+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-+		exit 1
-+		;;
-+esac
-+else
-+
-+# Here we handle the default operating systems that come with various machines.
-+# The value should be what the vendor currently ships out the door with their
-+# machine or put another way, the most popular os provided with the machine.
-+
-+# Note that if you're going to try to match "-MANUFACTURER" here (say,
-+# "-sun"), then you have to tell the case statement up towards the top
-+# that MANUFACTURER isn't an operating system.  Otherwise, code above
-+# will signal an error saying that MANUFACTURER isn't an operating
-+# system, and we'll never get to this point.
-+
-+case $basic_machine in
-+	*-acorn)
-+		os=-riscix1.2
-+		;;
-+	arm*-rebel)
-+		os=-linux
-+		;;
-+	arm*-semi)
-+		os=-aout
-+		;;
-+    c4x-* | tic4x-*)
-+        os=-coff
-+        ;;
-+	# This must come before the *-dec entry.
-+	pdp10-*)
-+		os=-tops20
-+		;;
-+	pdp11-*)
-+		os=-none
-+		;;
-+	*-dec | vax-*)
-+		os=-ultrix4.2
-+		;;
-+	m68*-apollo)
-+		os=-domain
-+		;;
-+	i386-sun)
-+		os=-sunos4.0.2
-+		;;
-+	m68000-sun)
-+		os=-sunos3
-+		# This also exists in the configure program, but was not the
-+		# default.
-+		# os=-sunos4
-+		;;
-+	m68*-cisco)
-+		os=-aout
-+		;;
-+	mips*-cisco)
-+		os=-elf
-+		;;
-+	mips*-*)
-+		os=-elf
-+		;;
-+	or32-*)
-+		os=-coff
-+		;;
-+	*-tti)	# must be before sparc entry or we get the wrong os.
-+		os=-sysv3
-+		;;
-+	sparc-* | *-sun)
-+		os=-sunos4.1.1
-+		;;
-+	*-be)
-+		os=-beos
-+		;;
-+	*-ibm)
-+		os=-aix
-+		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
-+	*-wec)
-+		os=-proelf
-+		;;
-+	*-winbond)
-+		os=-proelf
-+		;;
-+	*-oki)
-+		os=-proelf
-+		;;
-+	*-hp)
-+		os=-hpux
-+		;;
-+	*-hitachi)
-+		os=-hiux
-+		;;
-+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-+		os=-sysv
-+		;;
-+	*-cbm)
-+		os=-amigaos
-+		;;
-+	*-dg)
-+		os=-dgux
-+		;;
-+	*-dolphin)
-+		os=-sysv3
-+		;;
-+	m68k-ccur)
-+		os=-rtu
-+		;;
-+	m88k-omron*)
-+		os=-luna
-+		;;
-+	*-next )
-+		os=-nextstep
-+		;;
-+	*-sequent)
-+		os=-ptx
-+		;;
-+	*-crds)
-+		os=-unos
-+		;;
-+	*-ns)
-+		os=-genix
-+		;;
-+	i370-*)
-+		os=-mvs
-+		;;
-+	*-next)
-+		os=-nextstep3
-+		;;
-+	*-gould)
-+		os=-sysv
-+		;;
-+	*-highlevel)
-+		os=-bsd
-+		;;
-+	*-encore)
-+		os=-bsd
-+		;;
-+	*-sgi)
-+		os=-irix
-+		;;
-+	*-siemens)
-+		os=-sysv4
-+		;;
-+	*-masscomp)
-+		os=-rtu
-+		;;
-+	f30[01]-fujitsu | f700-fujitsu)
-+		os=-uxpv
-+		;;
-+	*-rom68k)
-+		os=-coff
-+		;;
-+	*-*bug)
-+		os=-coff
-+		;;
-+	*-apple)
-+		os=-macos
-+		;;
-+	*-atari*)
-+		os=-mint
-+		;;
-+	*)
-+		os=-none
-+		;;
-+esac
-+fi
-+
-+# Here we handle the case where we know the os, and the CPU type, but not the
-+# manufacturer.  We pick the logical manufacturer.
-+vendor=unknown
-+case $basic_machine in
-+	*-unknown)
-+		case $os in
-+			-riscix*)
-+				vendor=acorn
-+				;;
-+			-sunos*)
-+				vendor=sun
-+				;;
-+			-aix*)
-+				vendor=ibm
-+				;;
-+			-beos*)
-+				vendor=be
-+				;;
-+			-hpux*)
-+				vendor=hp
-+				;;
-+			-mpeix*)
-+				vendor=hp
-+				;;
-+			-hiux*)
-+				vendor=hitachi
-+				;;
-+			-unos*)
-+				vendor=crds
-+				;;
-+			-dgux*)
-+				vendor=dg
-+				;;
-+			-luna*)
-+				vendor=omron
-+				;;
-+			-genix*)
-+				vendor=ns
-+				;;
-+			-mvs* | -opened*)
-+				vendor=ibm
-+				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
-+			-ptx*)
-+				vendor=sequent
-+				;;
-+			-tpf*)
-+				vendor=ibm
-+				;;
-+			-vxsim* | -vxworks* | -windiss*)
-+				vendor=wrs
-+				;;
-+			-aux*)
-+				vendor=apple
-+				;;
-+			-hms*)
-+				vendor=hitachi
-+				;;
-+			-mpw* | -macos*)
-+				vendor=apple
-+				;;
-+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+				vendor=atari
-+				;;
-+			-vos*)
-+				vendor=stratus
-+				;;
-+		esac
-+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+		;;
-+esac
-+
-+echo $basic_machine$os
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff -Nrua kdenetwork-3.4.0.orig/configure kdenetwork-3.4.0/configure
---- kdenetwork-3.4.0.orig/configure	2005-03-04 12:37:31.000000000 +0000
-+++ kdenetwork-3.4.0/configure	2005-03-05 23:23:52.917581264 +0000
+ # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+diff -Nrua kdenetwork-3.4.1.orig/configure kdenetwork-3.4.1/configure
+--- kdenetwork-3.4.1.orig/configure	2005-05-23 18:09:11.000000000 +0200
++++ kdenetwork-3.4.1/configure	2005-05-24 17:07:12.000000000 +0200
 @@ -464,7 +464,7 @@
  # include <unistd.h>
  #endif"
@@ -5504,17 +1644,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4288,8 +4305,7 @@
+@@ -4265,8 +4282,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4377,8 +4393,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4377,8 +4393,7 @@
+@@ -4466,8 +4481,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5524,7 +1674,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4480,8 +4495,7 @@
+@@ -4569,8 +4583,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5534,7 +1684,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4580,8 +4594,7 @@
+@@ -4669,8 +4682,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5544,7 +1694,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4665,8 +4678,7 @@
+@@ -4754,8 +4766,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5554,7 +1704,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4755,8 +4767,7 @@
+@@ -4844,8 +4855,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5564,7 +1714,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4843,8 +4854,7 @@
+@@ -4932,8 +4942,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5574,7 +1724,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4931,8 +4941,7 @@
+@@ -5020,8 +5029,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5584,7 +1734,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5038,8 +5047,7 @@
+@@ -5127,8 +5135,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5594,7 +1744,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5126,8 +5134,7 @@
+@@ -5215,8 +5222,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5604,7 +1754,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5214,8 +5221,7 @@
+@@ -5303,8 +5309,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5614,7 +1764,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5302,8 +5308,7 @@
+@@ -5391,8 +5396,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5624,7 +1774,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5434,8 +5439,7 @@
+@@ -5523,8 +5527,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5634,7 +1784,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5523,8 +5527,7 @@
+@@ -5612,8 +5615,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5644,7 +1794,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5611,8 +5614,7 @@
+@@ -5700,8 +5702,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5654,7 +1804,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5699,8 +5701,7 @@
+@@ -5788,8 +5789,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5664,7 +1814,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5787,8 +5788,7 @@
+@@ -5876,8 +5876,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5674,7 +1824,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5875,8 +5875,7 @@
+@@ -5964,8 +5963,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5684,7 +1834,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6299,8 +6298,7 @@
+@@ -6388,8 +6386,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5694,7 +1844,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6426,8 +6424,7 @@
+@@ -6515,8 +6512,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5704,7 +1854,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6515,8 +6512,7 @@
+@@ -6604,8 +6600,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5714,7 +1864,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6599,185 +6595,6 @@
+@@ -6688,185 +6683,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -5900,7 +2050,7 @@
    fi
  
  
-@@ -6966,10 +6783,10 @@
+@@ -7055,10 +6871,10 @@
      fi
    done
  done
@@ -5912,7 +2062,7 @@
  echo "$as_me:$LINENO: result: $SED" >&5
  echo "${ECHO_T}$SED" >&6
  
-@@ -7203,31 +7020,23 @@
+@@ -7292,31 +7108,23 @@
    ;;
  
  cygwin*)
@@ -5952,7 +2102,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7266,42 +7075,21 @@
+@@ -7355,42 +7163,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -6002,7 +2152,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
-@@ -7330,9 +7118,6 @@
+@@ -7419,9 +7206,6 @@
    ;;
  
  osf3* | osf4* | osf5*)
@@ -6012,7 +2162,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7342,7 +7127,6 @@
+@@ -7431,7 +7215,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -6020,16 +2170,16 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7419,7 +7203,7 @@
+@@ -7508,7 +7291,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7422 "configure"' > conftest.$ac_ext
-+  echo '#line 7206 "configure"' > conftest.$ac_ext
+-  echo '#line 7511 "configure"' > conftest.$ac_ext
++  echo '#line 7294 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7464,12 +7248,11 @@
+@@ -7553,12 +7336,11 @@
    (exit $ac_status); }; then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
@@ -6043,7 +2193,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7481,7 +7264,6 @@
+@@ -7570,7 +7352,6 @@
        esac
        ;;
      *64-bit*)
@@ -6051,7 +2201,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7541,8 +7323,7 @@
+@@ -7630,8 +7411,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6061,7 +2211,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7617,8 +7398,7 @@
+@@ -7706,8 +7486,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6071,7 +2221,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7788,8 +7568,7 @@
+@@ -7877,8 +7656,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6081,7 +2231,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7856,8 +7635,7 @@
+@@ -7945,8 +7723,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6091,16 +2241,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8064,7 +7842,7 @@
+@@ -8153,7 +7930,7 @@
  
  
  # Provide some information about the compiler.
--echo "$as_me:8067:" \
-+echo "$as_me:7845:" \
+-echo "$as_me:8156:" \
++echo "$as_me:7933:" \
       "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
-@@ -8110,8 +7888,7 @@
+@@ -8199,8 +7976,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6110,7 +2260,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8160,8 +7937,7 @@
+@@ -8249,8 +8025,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6120,7 +2270,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8219,7 +7995,7 @@
+@@ -8308,7 +8083,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -6129,7 +2279,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8248,20 +8024,26 @@
+@@ -8337,20 +8112,26 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -6161,7 +2311,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.
-@@ -8329,7 +8111,7 @@
+@@ -8418,7 +8199,7 @@
    symcode='[BCDEGQRST]'
    ;;
  solaris* | sysv5*)
@@ -6170,7 +2320,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8347,7 +8129,7 @@
+@@ -8436,7 +8217,7 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -6179,35 +2329,35 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -9096,11 +8878,11 @@
+@@ -9185,11 +8966,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9099: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8881: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9188: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8969: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9103: \$? = $ac_status" >&5
-+   echo "$as_me:8885: \$? = $ac_status" >&5
+-   echo "$as_me:9192: \$? = $ac_status" >&5
++   echo "$as_me:8973: \$? = $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
-@@ -9329,11 +9111,11 @@
+@@ -9418,11 +9199,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9332: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9114: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9421: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9202: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9336: \$? = $ac_status" >&5
-+   echo "$as_me:9118: \$? = $ac_status" >&5
+-   echo "$as_me:9425: \$? = $ac_status" >&5
++   echo "$as_me:9206: \$? = $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
-@@ -9380,13 +9162,6 @@
+@@ -9469,13 +9250,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -6221,21 +2371,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.
-@@ -9396,11 +9171,11 @@
+@@ -9485,11 +9259,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9399: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9174: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9488: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9262: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9403: \$? = $ac_status" >&5
-+   echo "$as_me:9178: \$? = $ac_status" >&5
+-   echo "$as_me:9492: \$? = $ac_status" >&5
++   echo "$as_me:9266: \$? = $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
-@@ -9410,8 +9185,11 @@
+@@ -9499,8 +9273,11 @@
       fi
     fi
     chmod u+w .
@@ -6249,7 +2399,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9539,7 +9317,7 @@
+@@ -9628,7 +9405,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -6258,7 +2408,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9549,13 +9327,13 @@
+@@ -9638,13 +9415,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'
@@ -6274,7 +2424,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
-@@ -9564,19 +9342,19 @@
+@@ -9653,19 +9430,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -6298,7 +2448,7 @@
        fi
        ;;
  
-@@ -9594,8 +9372,8 @@
+@@ -9683,8 +9460,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6309,7 +2459,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9608,10 +9386,36 @@
+@@ -9697,10 +9474,36 @@
        hardcode_shlibpath_var=no
        ;;
  
@@ -6348,7 +2498,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9661,9 +9465,20 @@
+@@ -9750,9 +9553,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
@@ -6371,7 +2521,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9709,21 +9524,22 @@
+@@ -9798,21 +9612,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -6399,7 +2549,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9747,8 +9563,7 @@
+@@ -9836,8 +9651,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6409,7 +2559,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9775,14 +9590,13 @@
+@@ -9864,14 +9678,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -6427,7 +2577,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -9809,8 +9623,7 @@
+@@ -9898,8 +9711,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6437,7 +2587,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9848,7 +9661,7 @@
+@@ -9937,7 +9749,7 @@
  	  whole_archive_flag_spec=' '
  	  archive_cmds_need_lc=yes
  	  # This is similar to how AIX traditionally builds it's shared libraries.
@@ -6446,7 +2596,7 @@
  	fi
        fi
        ;;
-@@ -9871,13 +9684,13 @@
+@@ -9960,13 +9772,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -6463,7 +2613,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.
-@@ -9891,21 +9704,21 @@
+@@ -9980,21 +9792,21 @@
        archive_cmds_need_lc=no
        case "$host_os" in
        rhapsody* | darwin1.[012])
@@ -6498,7 +2648,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -9914,18 +9727,18 @@
+@@ -10003,18 +9815,18 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -6523,7 +2673,7 @@
        hardcode_direct=no
        hardcode_automatic=yes
        hardcode_shlibpath_var=unsupported
-@@ -9966,8 +9779,8 @@
+@@ -10055,8 +9867,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6534,7 +2684,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -9975,7 +9788,7 @@
+@@ -10064,7 +9876,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -6543,7 +2693,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
-@@ -9993,10 +9806,10 @@
+@@ -10082,10 +9894,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -6556,7 +2706,7 @@
  	  ;;
  	esac
        else
-@@ -10043,7 +9856,7 @@
+@@ -10132,7 +9944,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -6565,7 +2715,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'
-@@ -10053,7 +9866,7 @@
+@@ -10142,7 +9954,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -6574,7 +2724,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10076,7 +9889,7 @@
+@@ -10165,7 +9977,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
@@ -6583,7 +2733,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10086,7 +9899,7 @@
+@@ -10175,7 +9987,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -6592,7 +2742,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10097,14 +9910,14 @@
+@@ -10186,14 +9998,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -6609,7 +2759,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'
-@@ -10116,7 +9929,7 @@
+@@ -10205,7 +10017,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6618,7 +2768,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag=' -expect_unresolved \*'
-@@ -10141,9 +9954,9 @@
+@@ -10230,9 +10042,9 @@
      solaris*)
        no_undefined_flag=' -z text'
        if test "$GCC" = yes; then
@@ -6630,7 +2780,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~
-@@ -10163,7 +9976,7 @@
+@@ -10252,7 +10064,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.
@@ -6639,7 +2789,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10223,9 +10036,9 @@
+@@ -10312,9 +10124,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -6651,7 +2801,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var=no
-@@ -10331,7 +10144,7 @@
+@@ -10420,7 +10232,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -6660,7 +2810,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10341,7 +10154,20 @@
+@@ -10430,7 +10242,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6682,7 +2832,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10406,7 +10232,7 @@
+@@ -10495,7 +10320,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6691,7 +2841,7 @@
    ;;
  
  beos*)
-@@ -10431,7 +10257,7 @@
+@@ -10520,7 +10345,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -6700,7 +2850,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10496,7 +10322,7 @@
+@@ -10585,7 +10410,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -6709,7 +2859,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"`
-@@ -10519,7 +10345,7 @@
+@@ -10608,7 +10433,7 @@
    dynamic_linker=no
    ;;
  
@@ -6718,7 +2868,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10579,7 +10405,7 @@
+@@ -10668,7 +10493,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -6727,7 +2877,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10594,7 +10420,7 @@
+@@ -10683,7 +10508,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -6736,7 +2886,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10605,7 +10431,7 @@
+@@ -10694,7 +10519,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -6745,7 +2895,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10667,22 +10493,19 @@
+@@ -10756,22 +10581,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'
@@ -6774,7 +2924,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,
-@@ -10692,6 +10515,30 @@
+@@ -10781,6 +10603,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -6805,7 +2955,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10701,7 +10548,7 @@
+@@ -10790,7 +10636,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -6814,7 +2964,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10730,7 +10577,7 @@
+@@ -10819,7 +10665,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -6823,7 +2973,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
-@@ -10750,7 +10597,7 @@
+@@ -10839,7 +10685,7 @@
  
  os2*)
    libname_spec='$name'
@@ -6832,7 +2982,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -10979,8 +10826,7 @@
+@@ -11068,8 +10914,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6842,7 +2992,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11083,8 +10929,7 @@
+@@ -11172,8 +11017,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6852,7 +3002,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11149,8 +10994,7 @@
+@@ -11238,8 +11082,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6862,7 +3012,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11243,8 +11087,7 @@
+@@ -11332,8 +11175,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6872,7 +3022,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11309,8 +11152,7 @@
+@@ -11398,8 +11240,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6882,7 +3032,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11376,8 +11218,7 @@
+@@ -11465,8 +11306,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6892,7 +3042,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11443,8 +11284,7 @@
+@@ -11532,8 +11372,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -6902,25 +3052,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11519,7 +11359,7 @@
+@@ -11608,7 +11447,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11522 "configure"
-+#line 11362 "configure"
+-#line 11611 "configure"
++#line 11450 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11617,7 +11457,7 @@
+@@ -11706,7 +11545,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11620 "configure"
-+#line 11460 "configure"
+-#line 11709 "configure"
++#line 11548 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11742,7 +11582,7 @@
+@@ -11831,7 +11670,7 @@
    fi
    ;;
  
@@ -6929,7 +3079,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -11752,29 +11592,29 @@
+@@ -11841,29 +11680,29 @@
      archive_cmds_need_lc=no
      case "$host_os" in
      rhapsody* | darwin1.[012])
@@ -6973,7 +3123,7 @@
      hardcode_direct=no
      hardcode_automatic=yes
      hardcode_shlibpath_var=unsupported
-@@ -11808,7 +11648,8 @@
+@@ -11897,7 +11736,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.
@@ -6983,7 +3133,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 \
-@@ -11986,7 +11827,7 @@
+@@ -12075,7 +11915,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -6992,7 +3142,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12017,7 +11858,7 @@
+@@ -12106,7 +11946,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -7001,7 +3151,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12259,7 +12100,10 @@
+@@ -12348,7 +12188,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.
@@ -7013,7 +3163,7 @@
  fi
  
  
-@@ -12527,8 +12371,8 @@
+@@ -12616,8 +12459,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
@@ -7024,7 +3174,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12554,7 +12398,7 @@
+@@ -12643,7 +12486,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.
@@ -7033,7 +3183,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12585,8 +12429,22 @@
+@@ -12674,8 +12517,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -7058,7 +3208,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12632,15 +12490,16 @@
+@@ -12721,15 +12578,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -7079,7 +3229,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.
-@@ -12670,8 +12529,7 @@
+@@ -12759,8 +12617,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7089,7 +3239,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12700,13 +12558,12 @@
+@@ -12789,13 +12646,12 @@
  
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -7105,7 +3255,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12733,8 +12590,7 @@
+@@ -12822,8 +12678,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7115,7 +3265,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12772,7 +12628,7 @@
+@@ -12861,7 +12716,7 @@
  	whole_archive_flag_spec_CXX=' '
  	archive_cmds_need_lc_CXX=yes
  	# This is similar to how AIX traditionally builds it's shared libraries.
@@ -7124,7 +3274,7 @@
        fi
      fi
      ;;
-@@ -12789,12 +12645,12 @@
+@@ -12878,12 +12733,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'
@@ -7139,7 +3289,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
-@@ -12803,7 +12659,7 @@
+@@ -12892,7 +12747,7 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -7148,7 +3298,7 @@
      else
        ld_shlibs_CXX=no
      fi
-@@ -12814,20 +12670,20 @@
+@@ -12903,20 +12758,20 @@
      archive_cmds_need_lc_CXX=no
      case "$host_os" in
      rhapsody* | darwin1.[012])
@@ -7179,7 +3329,7 @@
        fi
        ;;
      esac
-@@ -12837,19 +12693,19 @@
+@@ -12926,19 +12781,19 @@
        lt_int_apple_cc_single_mod=yes
      fi
      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -7205,7 +3355,7 @@
      hardcode_direct_CXX=no
      hardcode_automatic_CXX=yes
      hardcode_shlibpath_var_CXX=unsupported
-@@ -12884,7 +12740,7 @@
+@@ -12973,7 +12828,7 @@
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
@@ -7214,7 +3364,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -12906,7 +12762,7 @@
+@@ -12995,7 +12850,7 @@
        ld_shlibs_CXX=no
        ;;
      aCC)
@@ -7223,7 +3373,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -12915,11 +12771,11 @@
+@@ -13004,11 +12859,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.
@@ -7237,7 +3387,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -12976,7 +12832,7 @@
+@@ -13065,7 +12920,7 @@
  	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -7246,7 +3396,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -12997,7 +12853,7 @@
+@@ -13086,7 +12941,7 @@
  	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -7255,7 +3405,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13012,7 +12868,7 @@
+@@ -13101,7 +12956,7 @@
      case $cc_basename in
        CC)
  	# SGI C++
@@ -7264,7 +3414,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13023,9 +12879,9 @@
+@@ -13112,9 +12967,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -7276,7 +3426,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13042,8 +12898,8 @@
+@@ -13131,8 +12986,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.
@@ -7287,7 +3437,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13065,16 +12921,16 @@
+@@ -13154,16 +13009,16 @@
  	# Intel C++
  	with_gnu_ld=yes
  	archive_cmds_need_lc_CXX=no
@@ -7308,7 +3458,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13112,7 +12968,7 @@
+@@ -13201,7 +13056,7 @@
  	;;
      esac
      ;;
@@ -7317,7 +3467,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=
-@@ -13131,7 +12987,7 @@
+@@ -13220,7 +13075,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.
@@ -7326,7 +3476,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13148,7 +13004,7 @@
+@@ -13237,7 +13092,7 @@
  	;;
        cxx)
  	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7335,7 +3485,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13166,7 +13022,7 @@
+@@ -13255,7 +13110,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7344,7 +3494,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13191,7 +13047,7 @@
+@@ -13280,7 +13135,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.
@@ -7353,7 +3503,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13207,10 +13063,10 @@
+@@ -13296,10 +13151,10 @@
  	;;
        cxx)
  	allow_undefined_flag_CXX=' -expect_unresolved \*'
@@ -7366,7 +3516,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13229,7 +13085,7 @@
+@@ -13318,7 +13173,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7375,7 +3525,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13286,9 +13142,9 @@
+@@ -13375,9 +13230,9 @@
        CC)
  	# Sun C++ 4.2, 5.x and Centerline C++
  	no_undefined_flag_CXX=' -zdefs'
@@ -7387,7 +3537,7 @@
  
  	hardcode_libdir_flag_spec_CXX='-R$libdir'
  	hardcode_shlibpath_var_CXX=no
-@@ -13322,7 +13178,7 @@
+@@ -13411,7 +13266,7 @@
  	;;
        gcx)
  	# Green Hills C++ Compiler
@@ -7396,7 +3546,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13332,9 +13188,9 @@
+@@ -13421,9 +13276,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
@@ -7408,7 +3558,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13343,9 +13199,9 @@
+@@ -13432,9 +13287,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -7420,7 +3570,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13460,7 +13316,7 @@
+@@ -13549,7 +13404,7 @@
         fi
         ;;
  
@@ -7429,7 +3579,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13595,7 +13451,7 @@
+@@ -13684,7 +13539,7 @@
  	    ;;
  	esac
  	;;
@@ -7438,7 +3588,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -13671,7 +13527,7 @@
+@@ -13760,7 +13615,7 @@
  	    ;;
  	esac
  	;;
@@ -7447,21 +3597,21 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -13782,11 +13638,11 @@
+@@ -13871,11 +13726,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13785: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13641: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13874: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13729: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:13789: \$? = $ac_status" >&5
-+   echo "$as_me:13645: \$? = $ac_status" >&5
+-   echo "$as_me:13878: \$? = $ac_status" >&5
++   echo "$as_me:13733: \$? = $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
-@@ -13833,13 +13689,6 @@
+@@ -13922,13 +13777,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -7475,21 +3625,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.
-@@ -13849,11 +13698,11 @@
+@@ -13938,11 +13786,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:13852: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13701: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13941: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13789: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:13856: \$? = $ac_status" >&5
-+   echo "$as_me:13705: \$? = $ac_status" >&5
+-   echo "$as_me:13945: \$? = $ac_status" >&5
++   echo "$as_me:13793: \$? = $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
-@@ -13863,8 +13712,11 @@
+@@ -13952,8 +13800,11 @@
       fi
     fi
     chmod u+w .
@@ -7503,7 +3653,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -13916,6 +13768,9 @@
+@@ -14005,6 +13856,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'
    ;;
@@ -7513,7 +3663,7 @@
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -13997,7 +13852,7 @@
+@@ -14086,7 +13940,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -7522,7 +3672,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14007,7 +13862,20 @@
+@@ -14096,7 +13950,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7544,7 +3694,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14072,7 +13940,7 @@
+@@ -14161,7 +14028,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7553,7 +3703,7 @@
    ;;
  
  beos*)
-@@ -14097,7 +13965,7 @@
+@@ -14186,7 +14053,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -7562,7 +3712,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14162,7 +14030,7 @@
+@@ -14251,7 +14118,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -7571,7 +3721,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"`
-@@ -14185,7 +14053,7 @@
+@@ -14274,7 +14141,7 @@
    dynamic_linker=no
    ;;
  
@@ -7580,7 +3730,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14245,7 +14113,7 @@
+@@ -14334,7 +14201,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -7589,7 +3739,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14260,7 +14128,7 @@
+@@ -14349,7 +14216,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -7598,7 +3748,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14271,7 +14139,7 @@
+@@ -14360,7 +14227,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -7607,7 +3757,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14333,22 +14201,19 @@
+@@ -14422,22 +14289,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'
@@ -7636,7 +3786,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,
-@@ -14358,6 +14223,30 @@
+@@ -14447,6 +14311,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -7667,7 +3817,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14367,7 +14256,7 @@
+@@ -14456,7 +14344,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -7676,7 +3826,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14396,7 +14285,7 @@
+@@ -14485,7 +14373,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -7685,7 +3835,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
-@@ -14416,7 +14305,7 @@
+@@ -14505,7 +14393,7 @@
  
  os2*)
    libname_spec='$name'
@@ -7694,7 +3844,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14645,8 +14534,7 @@
+@@ -14734,8 +14622,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7704,7 +3854,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14749,8 +14637,7 @@
+@@ -14838,8 +14725,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7714,7 +3864,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14815,8 +14702,7 @@
+@@ -14904,8 +14790,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7724,7 +3874,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14909,8 +14795,7 @@
+@@ -14998,8 +14883,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7734,7 +3884,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14975,8 +14860,7 @@
+@@ -15064,8 +14948,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7744,7 +3894,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15042,8 +14926,7 @@
+@@ -15131,8 +15014,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7754,7 +3904,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15109,8 +14992,7 @@
+@@ -15198,8 +15080,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7764,25 +3914,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15185,7 +15067,7 @@
+@@ -15274,7 +15155,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 15188 "configure"
-+#line 15070 "configure"
+-#line 15277 "configure"
++#line 15158 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15283,7 +15165,7 @@
+@@ -15372,7 +15253,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 15286 "configure"
-+#line 15168 "configure"
+-#line 15375 "configure"
++#line 15256 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15400,7 +15282,8 @@
+@@ -15489,7 +15370,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.
@@ -7792,7 +3942,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 \
-@@ -15530,7 +15413,7 @@
+@@ -15619,7 +15501,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -7801,7 +3951,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -15561,7 +15444,7 @@
+@@ -15650,7 +15532,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -7810,7 +3960,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -15778,7 +15661,10 @@
+@@ -15867,7 +15749,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.
@@ -7822,7 +3972,7 @@
  fi
  
  
-@@ -15880,7 +15766,7 @@
+@@ -15969,7 +15854,7 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -7831,21 +3981,21 @@
    test "$enable_shared" = yes && enable_static=no
    ;;
  esac
-@@ -16106,11 +15992,11 @@
+@@ -16195,11 +16080,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16109: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15995: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16198: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16083: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16113: \$? = $ac_status" >&5
-+   echo "$as_me:15999: \$? = $ac_status" >&5
+-   echo "$as_me:16202: \$? = $ac_status" >&5
++   echo "$as_me:16087: \$? = $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
-@@ -16157,13 +16043,6 @@
+@@ -16246,13 +16131,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -7859,21 +4009,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.
-@@ -16173,11 +16052,11 @@
+@@ -16262,11 +16140,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16176: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16055: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16265: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16143: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16180: \$? = $ac_status" >&5
-+   echo "$as_me:16059: \$? = $ac_status" >&5
+-   echo "$as_me:16269: \$? = $ac_status" >&5
++   echo "$as_me:16147: \$? = $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
-@@ -16187,8 +16066,11 @@
+@@ -16276,8 +16154,11 @@
       fi
     fi
     chmod u+w .
@@ -7887,7 +4037,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16316,7 +16198,7 @@
+@@ -16405,7 +16286,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -7896,7 +4046,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16326,13 +16208,13 @@
+@@ -16415,13 +16296,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'
@@ -7912,7 +4062,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
-@@ -16341,19 +16223,19 @@
+@@ -16430,19 +16311,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -7936,7 +4086,7 @@
        fi
        ;;
  
-@@ -16371,8 +16253,8 @@
+@@ -16460,8 +16341,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7947,7 +4097,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16385,10 +16267,36 @@
+@@ -16474,10 +16355,36 @@
        hardcode_shlibpath_var_F77=no
        ;;
  
@@ -7986,7 +4136,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16438,9 +16346,20 @@
+@@ -16527,9 +16434,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
@@ -8009,7 +4159,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16486,21 +16405,22 @@
+@@ -16575,21 +16493,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -8037,7 +4187,7 @@
        program main
  
        end
-@@ -16514,8 +16434,7 @@
+@@ -16603,8 +16522,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8047,7 +4197,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16542,14 +16461,13 @@
+@@ -16631,14 +16549,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -8065,7 +4215,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16566,8 +16484,7 @@
+@@ -16655,8 +16572,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8075,7 +4225,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16605,7 +16522,7 @@
+@@ -16694,7 +16610,7 @@
  	  whole_archive_flag_spec_F77=' '
  	  archive_cmds_need_lc_F77=yes
  	  # This is similar to how AIX traditionally builds it's shared libraries.
@@ -8084,7 +4234,7 @@
  	fi
        fi
        ;;
-@@ -16628,13 +16545,13 @@
+@@ -16717,13 +16633,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -8101,7 +4251,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.
-@@ -16648,21 +16565,21 @@
+@@ -16737,21 +16653,21 @@
        archive_cmds_need_lc_F77=no
        case "$host_os" in
        rhapsody* | darwin1.[012])
@@ -8136,7 +4286,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -16671,18 +16588,18 @@
+@@ -16760,18 +16676,18 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -8161,7 +4311,7 @@
        hardcode_direct_F77=no
        hardcode_automatic_F77=yes
        hardcode_shlibpath_var_F77=unsupported
-@@ -16723,8 +16640,8 @@
+@@ -16812,8 +16728,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8172,7 +4322,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -16732,7 +16649,7 @@
+@@ -16821,7 +16737,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -8181,7 +4331,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
-@@ -16750,10 +16667,10 @@
+@@ -16839,10 +16755,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -8194,7 +4344,7 @@
  	  ;;
  	esac
        else
-@@ -16800,7 +16717,7 @@
+@@ -16889,7 +16805,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -8203,7 +4353,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'
-@@ -16810,7 +16727,7 @@
+@@ -16899,7 +16815,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -8212,7 +4362,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
-@@ -16833,7 +16750,7 @@
+@@ -16922,7 +16838,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
@@ -8221,7 +4371,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -16843,7 +16760,7 @@
+@@ -16932,7 +16848,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -8230,7 +4380,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -16854,14 +16771,14 @@
+@@ -16943,14 +16859,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -8247,7 +4397,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'
-@@ -16873,7 +16790,7 @@
+@@ -16962,7 +16878,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8256,7 +4406,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16898,9 +16815,9 @@
+@@ -16987,9 +16903,9 @@
      solaris*)
        no_undefined_flag_F77=' -z text'
        if test "$GCC" = yes; then
@@ -8268,7 +4418,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~
-@@ -16920,7 +16837,7 @@
+@@ -17009,7 +16925,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.
@@ -8277,7 +4427,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -16980,9 +16897,9 @@
+@@ -17069,9 +16985,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_F77='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -8289,7 +4439,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_F77=no
-@@ -17088,7 +17005,7 @@
+@@ -17177,7 +17093,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -8298,7 +4448,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17098,7 +17015,20 @@
+@@ -17187,7 +17103,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8320,7 +4470,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17163,7 +17093,7 @@
+@@ -17252,7 +17181,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8329,7 +4479,7 @@
    ;;
  
  beos*)
-@@ -17188,7 +17118,7 @@
+@@ -17277,7 +17206,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -8338,7 +4488,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17253,7 +17183,7 @@
+@@ -17342,7 +17271,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -8347,7 +4497,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"`
-@@ -17276,7 +17206,7 @@
+@@ -17365,7 +17294,7 @@
    dynamic_linker=no
    ;;
  
@@ -8356,7 +4506,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17336,7 +17266,7 @@
+@@ -17425,7 +17354,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -8365,7 +4515,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17351,7 +17281,7 @@
+@@ -17440,7 +17369,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -8374,7 +4524,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17362,7 +17292,7 @@
+@@ -17451,7 +17380,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -8383,7 +4533,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17424,22 +17354,19 @@
+@@ -17513,22 +17442,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'
@@ -8412,7 +4562,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,
-@@ -17449,6 +17376,30 @@
+@@ -17538,6 +17464,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -8443,7 +4593,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17458,7 +17409,7 @@
+@@ -17547,7 +17497,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -8452,7 +4602,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17487,7 +17438,7 @@
+@@ -17576,7 +17526,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -8461,7 +4611,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
-@@ -17507,7 +17458,7 @@
+@@ -17596,7 +17546,7 @@
  
  os2*)
    libname_spec='$name'
@@ -8470,7 +4620,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17686,7 +17637,8 @@
+@@ -17775,7 +17725,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -8480,7 +4630,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 \
-@@ -17816,7 +17768,7 @@
+@@ -17905,7 +17856,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -8489,7 +4639,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -17847,7 +17799,7 @@
+@@ -17936,7 +17887,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -8498,7 +4648,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18064,7 +18016,10 @@
+@@ -18153,7 +18104,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.
@@ -8510,35 +4660,35 @@
  fi
  
  
-@@ -18146,11 +18101,11 @@
+@@ -18235,11 +18189,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18149: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18104: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18238: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18192: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18153: \$? = $ac_status" >&5
-+   echo "$as_me:18108: \$? = $ac_status" >&5
+-   echo "$as_me:18242: \$? = $ac_status" >&5
++   echo "$as_me:18196: \$? = $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
-@@ -18379,11 +18334,11 @@
+@@ -18468,11 +18422,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18382: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18337: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18471: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18425: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18386: \$? = $ac_status" >&5
-+   echo "$as_me:18341: \$? = $ac_status" >&5
+-   echo "$as_me:18475: \$? = $ac_status" >&5
++   echo "$as_me:18429: \$? = $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
-@@ -18430,13 +18385,6 @@
+@@ -18519,13 +18473,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -8552,21 +4702,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.
-@@ -18446,11 +18394,11 @@
+@@ -18535,11 +18482,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18449: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18397: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18538: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18485: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18453: \$? = $ac_status" >&5
-+   echo "$as_me:18401: \$? = $ac_status" >&5
+-   echo "$as_me:18542: \$? = $ac_status" >&5
++   echo "$as_me:18489: \$? = $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
-@@ -18460,8 +18408,11 @@
+@@ -18549,8 +18496,11 @@
       fi
     fi
     chmod u+w .
@@ -8580,7 +4730,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18589,7 +18540,7 @@
+@@ -18678,7 +18628,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -8589,7 +4739,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18599,13 +18550,13 @@
+@@ -18688,13 +18638,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'
@@ -8605,7 +4755,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
-@@ -18614,19 +18565,19 @@
+@@ -18703,19 +18653,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -8629,7 +4779,7 @@
        fi
        ;;
  
-@@ -18644,8 +18595,8 @@
+@@ -18733,8 +18683,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8640,7 +4790,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18658,10 +18609,36 @@
+@@ -18747,10 +18697,36 @@
        hardcode_shlibpath_var_GCJ=no
        ;;
  
@@ -8679,7 +4829,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18711,9 +18688,20 @@
+@@ -18800,9 +18776,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
@@ -8702,7 +4852,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18759,21 +18747,22 @@
+@@ -18848,21 +18835,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -8730,7 +4880,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -18797,8 +18786,7 @@
+@@ -18886,8 +18874,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8740,7 +4890,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18825,14 +18813,13 @@
+@@ -18914,14 +18901,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -8758,7 +4908,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -18859,8 +18846,7 @@
+@@ -18948,8 +18934,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8768,7 +4918,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18898,7 +18884,7 @@
+@@ -18987,7 +18972,7 @@
  	  whole_archive_flag_spec_GCJ=' '
  	  archive_cmds_need_lc_GCJ=yes
  	  # This is similar to how AIX traditionally builds it's shared libraries.
@@ -8777,7 +4927,7 @@
  	fi
        fi
        ;;
-@@ -18921,13 +18907,13 @@
+@@ -19010,13 +18995,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -8794,7 +4944,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.
-@@ -18941,21 +18927,21 @@
+@@ -19030,21 +19015,21 @@
        archive_cmds_need_lc_GCJ=no
        case "$host_os" in
        rhapsody* | darwin1.[012])
@@ -8829,7 +4979,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -18964,18 +18950,18 @@
+@@ -19053,18 +19038,18 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -8854,7 +5004,7 @@
        hardcode_direct_GCJ=no
        hardcode_automatic_GCJ=yes
        hardcode_shlibpath_var_GCJ=unsupported
-@@ -19016,8 +19002,8 @@
+@@ -19105,8 +19090,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8865,7 +5015,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19025,7 +19011,7 @@
+@@ -19114,7 +19099,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -8874,7 +5024,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
-@@ -19043,10 +19029,10 @@
+@@ -19132,10 +19117,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -8887,7 +5037,7 @@
  	  ;;
  	esac
        else
-@@ -19093,7 +19079,7 @@
+@@ -19182,7 +19167,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -8896,7 +5046,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'
-@@ -19103,7 +19089,7 @@
+@@ -19192,7 +19177,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -8905,7 +5055,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
-@@ -19126,7 +19112,7 @@
+@@ -19215,7 +19200,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
@@ -8914,7 +5064,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19136,7 +19122,7 @@
+@@ -19225,7 +19210,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -8923,7 +5073,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19147,14 +19133,14 @@
+@@ -19236,14 +19221,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -8940,7 +5090,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'
-@@ -19166,7 +19152,7 @@
+@@ -19255,7 +19240,7 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -8949,7 +5099,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
        else
  	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19191,9 +19177,9 @@
+@@ -19280,9 +19265,9 @@
      solaris*)
        no_undefined_flag_GCJ=' -z text'
        if test "$GCC" = yes; then
@@ -8961,7 +5111,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~
-@@ -19213,7 +19199,7 @@
+@@ -19302,7 +19287,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.
@@ -8970,7 +5120,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19273,9 +19259,9 @@
+@@ -19362,9 +19347,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_GCJ='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -8982,7 +5132,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_GCJ=no
-@@ -19381,7 +19367,7 @@
+@@ -19470,7 +19455,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -8991,7 +5141,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19391,7 +19377,20 @@
+@@ -19480,7 +19465,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9013,7 +5163,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19456,7 +19455,7 @@
+@@ -19545,7 +19543,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9022,7 +5172,7 @@
    ;;
  
  beos*)
-@@ -19481,7 +19480,7 @@
+@@ -19570,7 +19568,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -9031,7 +5181,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19546,7 +19545,7 @@
+@@ -19635,7 +19633,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -9040,7 +5190,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"`
-@@ -19569,7 +19568,7 @@
+@@ -19658,7 +19656,7 @@
    dynamic_linker=no
    ;;
  
@@ -9049,7 +5199,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19629,7 +19628,7 @@
+@@ -19718,7 +19716,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -9058,7 +5208,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19644,7 +19643,7 @@
+@@ -19733,7 +19731,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -9067,7 +5217,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19655,7 +19654,7 @@
+@@ -19744,7 +19742,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -9076,7 +5226,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19717,22 +19716,19 @@
+@@ -19806,22 +19804,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'
@@ -9105,7 +5255,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,
-@@ -19742,6 +19738,30 @@
+@@ -19831,6 +19826,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -9136,7 +5286,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -19751,7 +19771,7 @@
+@@ -19840,7 +19859,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -9145,7 +5295,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -19780,7 +19800,7 @@
+@@ -19869,7 +19888,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -9154,7 +5304,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
-@@ -19800,7 +19820,7 @@
+@@ -19889,7 +19908,7 @@
  
  os2*)
    libname_spec='$name'
@@ -9163,7 +5313,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -20029,8 +20049,7 @@
+@@ -20118,8 +20137,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9173,7 +5323,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20133,8 +20152,7 @@
+@@ -20222,8 +20240,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9183,7 +5333,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20199,8 +20217,7 @@
+@@ -20288,8 +20305,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9193,7 +5343,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20293,8 +20310,7 @@
+@@ -20382,8 +20398,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9203,7 +5353,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20359,8 +20375,7 @@
+@@ -20448,8 +20463,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9213,7 +5363,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20426,8 +20441,7 @@
+@@ -20515,8 +20529,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9223,7 +5373,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20493,8 +20507,7 @@
+@@ -20582,8 +20595,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9233,25 +5383,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20569,7 +20582,7 @@
+@@ -20658,7 +20670,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 20572 "configure"
-+#line 20585 "configure"
+-#line 20661 "configure"
++#line 20673 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20667,7 +20680,7 @@
+@@ -20756,7 +20768,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 20670 "configure"
-+#line 20683 "configure"
+-#line 20759 "configure"
++#line 20771 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20784,7 +20797,8 @@
+@@ -20873,7 +20885,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.
@@ -9261,7 +5411,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 \
-@@ -20914,7 +20928,7 @@
+@@ -21003,7 +21016,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -9270,7 +5420,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -20945,7 +20959,7 @@
+@@ -21034,7 +21047,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -9279,7 +5429,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21162,7 +21176,10 @@
+@@ -21251,7 +21264,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.
@@ -9291,7 +5441,7 @@
  fi
  
  
-@@ -21225,7 +21242,8 @@
+@@ -21314,7 +21330,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.
@@ -9301,7 +5451,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 \
-@@ -21355,7 +21373,7 @@
+@@ -21444,7 +21461,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -9310,7 +5460,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21386,7 +21404,7 @@
+@@ -21475,7 +21492,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -9319,7 +5469,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21603,7 +21621,10 @@
+@@ -21692,7 +21709,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.
@@ -9331,7 +5481,7 @@
  fi
  
  
-@@ -21650,7 +21671,7 @@
+@@ -21739,7 +21759,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -9340,7 +5490,7 @@
  
  # Prevent multiple expansion
  
-@@ -21887,8 +21908,7 @@
+@@ -21976,8 +21996,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9350,7 +5500,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -21962,9 +21982,6 @@
+@@ -22051,9 +22070,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9360,7 +5510,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21998,8 +22015,7 @@
+@@ -22087,8 +22103,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9370,7 +5520,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22103,8 +22119,7 @@
+@@ -22192,8 +22207,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9380,7 +5530,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22183,9 +22198,6 @@
+@@ -22272,9 +22286,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9390,7 +5540,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22218,8 +22230,7 @@
+@@ -22307,8 +22318,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9400,7 +5550,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22322,8 +22333,7 @@
+@@ -22411,8 +22421,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9410,7 +5560,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22413,8 +22423,7 @@
+@@ -22502,8 +22511,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9420,7 +5570,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22475,8 +22484,7 @@
+@@ -22564,8 +22572,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9430,7 +5580,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22544,8 +22552,7 @@
+@@ -22633,8 +22640,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9440,7 +5590,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22611,8 +22618,7 @@
+@@ -22700,8 +22706,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9450,7 +5600,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22705,8 +22711,7 @@
+@@ -22794,8 +22799,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9460,7 +5610,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22784,8 +22789,7 @@
+@@ -22873,8 +22877,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9470,7 +5620,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22869,8 +22873,7 @@
+@@ -22958,8 +22961,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9480,7 +5630,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22938,8 +22941,7 @@
+@@ -23027,8 +23029,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9490,7 +5640,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23034,8 +23036,7 @@
+@@ -23123,8 +23124,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9500,7 +5650,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23099,8 +23100,7 @@
+@@ -23188,8 +23188,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9510,7 +5660,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23195,8 +23195,7 @@
+@@ -23284,8 +23283,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9520,7 +5670,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23260,8 +23259,7 @@
+@@ -23349,8 +23347,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9530,7 +5680,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23357,8 +23355,7 @@
+@@ -23446,8 +23443,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9540,7 +5690,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23422,8 +23419,7 @@
+@@ -23511,8 +23507,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9550,7 +5700,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23520,8 +23516,7 @@
+@@ -23609,8 +23604,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9560,7 +5710,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23586,8 +23581,7 @@
+@@ -23675,8 +23669,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9570,7 +5720,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23655,8 +23649,7 @@
+@@ -23744,8 +23737,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9580,7 +5730,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23807,8 +23800,7 @@
+@@ -23896,8 +23888,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9590,7 +5740,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23963,8 +23955,7 @@
+@@ -24052,8 +24043,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9600,7 +5750,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24029,8 +24020,7 @@
+@@ -24118,8 +24108,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9610,7 +5760,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24177,8 +24167,7 @@
+@@ -24266,8 +24255,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9620,7 +5770,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24333,8 +24322,7 @@
+@@ -24422,8 +24410,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9630,7 +5780,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24390,9 +24378,6 @@
+@@ -24479,9 +24466,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9640,7 +5790,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24426,8 +24411,7 @@
+@@ -24515,8 +24499,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9650,7 +5800,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24531,8 +24515,7 @@
+@@ -24620,8 +24603,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9660,7 +5810,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24632,8 +24615,7 @@
+@@ -24721,8 +24703,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9670,7 +5820,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24707,8 +24689,7 @@
+@@ -24796,8 +24777,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9680,7 +5830,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24771,8 +24752,7 @@
+@@ -24860,8 +24840,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9690,7 +5840,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24834,8 +24814,7 @@
+@@ -24923,8 +24902,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9700,7 +5850,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24875,8 +24854,7 @@
+@@ -24964,8 +24942,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9710,7 +5860,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24932,8 +24910,7 @@
+@@ -25021,8 +24998,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9720,7 +5870,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24973,8 +24950,7 @@
+@@ -25062,8 +25038,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9730,7 +5880,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25038,8 +25014,7 @@
+@@ -25127,8 +25102,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9740,7 +5890,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25070,10 +25045,8 @@
+@@ -25159,10 +25133,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -9753,7 +5903,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25184,8 +25157,7 @@
+@@ -25273,8 +25245,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9763,7 +5913,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25247,8 +25219,7 @@
+@@ -25336,8 +25307,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9773,7 +5923,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25288,8 +25259,7 @@
+@@ -25377,8 +25347,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9783,7 +5933,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25345,8 +25315,7 @@
+@@ -25434,8 +25403,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9793,7 +5943,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25386,8 +25355,7 @@
+@@ -25475,8 +25443,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9803,7 +5953,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25451,8 +25419,7 @@
+@@ -25540,8 +25507,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9813,7 +5963,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25483,10 +25450,8 @@
+@@ -25572,10 +25538,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -9826,7 +5976,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25597,8 +25562,7 @@
+@@ -25686,8 +25650,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9836,7 +5986,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25660,8 +25624,7 @@
+@@ -25749,8 +25712,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9846,7 +5996,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25701,8 +25664,7 @@
+@@ -25790,8 +25752,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9856,7 +6006,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25758,8 +25720,7 @@
+@@ -25847,8 +25808,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9866,7 +6016,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25799,8 +25760,7 @@
+@@ -25888,8 +25848,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9876,7 +6026,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25864,8 +25824,7 @@
+@@ -25953,8 +25912,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9886,7 +6036,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25896,10 +25855,8 @@
+@@ -25985,10 +25943,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -9899,7 +6049,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26010,8 +25967,7 @@
+@@ -26099,8 +26055,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9909,7 +6059,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26073,8 +26029,7 @@
+@@ -26162,8 +26117,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9919,7 +6069,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26114,8 +26069,7 @@
+@@ -26203,8 +26157,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9929,7 +6079,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26171,8 +26125,7 @@
+@@ -26260,8 +26213,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9939,7 +6089,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26212,8 +26165,7 @@
+@@ -26301,8 +26253,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9949,7 +6099,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26277,8 +26229,7 @@
+@@ -26366,8 +26317,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9959,7 +6109,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26309,10 +26260,8 @@
+@@ -26398,10 +26348,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -9972,7 +6122,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26431,8 +26380,7 @@
+@@ -26520,8 +26468,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9982,7 +6132,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26503,8 +26451,7 @@
+@@ -26592,8 +26539,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9992,7 +6142,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26574,8 +26521,7 @@
+@@ -26663,8 +26609,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10002,7 +6152,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26637,8 +26583,7 @@
+@@ -26726,8 +26671,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10012,7 +6162,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26678,8 +26623,7 @@
+@@ -26767,8 +26711,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10022,7 +6172,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26735,8 +26679,7 @@
+@@ -26824,8 +26767,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10032,7 +6182,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26776,8 +26719,7 @@
+@@ -26865,8 +26807,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10042,7 +6192,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26841,8 +26783,7 @@
+@@ -26930,8 +26871,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10052,7 +6202,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26873,10 +26814,8 @@
+@@ -26962,10 +26902,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10065,7 +6215,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26988,8 +26927,7 @@
+@@ -27077,8 +27015,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10075,7 +6225,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27051,8 +26989,7 @@
+@@ -27140,8 +27077,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10085,7 +6235,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27092,8 +27029,7 @@
+@@ -27181,8 +27117,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10095,7 +6245,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27149,8 +27085,7 @@
+@@ -27238,8 +27173,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10105,7 +6255,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27190,8 +27125,7 @@
+@@ -27279,8 +27213,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10115,7 +6265,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27255,8 +27189,7 @@
+@@ -27344,8 +27277,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10125,7 +6275,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27287,10 +27220,8 @@
+@@ -27376,10 +27308,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10138,7 +6288,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27401,8 +27332,7 @@
+@@ -27490,8 +27420,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10148,7 +6298,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27472,8 +27402,7 @@
+@@ -27561,8 +27490,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10158,7 +6308,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27653,8 +27582,7 @@
+@@ -27742,8 +27670,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10168,7 +6318,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27763,8 +27691,7 @@
+@@ -27852,8 +27779,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10178,7 +6328,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27988,8 +27915,7 @@
+@@ -28077,8 +28003,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10188,7 +6338,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28212,8 +28138,7 @@
+@@ -28301,8 +28226,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10198,7 +6348,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28289,8 +28214,7 @@
+@@ -28378,8 +28302,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10208,7 +6358,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28513,8 +28437,7 @@
+@@ -28602,8 +28525,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10218,7 +6368,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28589,8 +28512,7 @@
+@@ -28678,8 +28600,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10228,7 +6378,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28650,8 +28572,7 @@
+@@ -28739,8 +28660,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10238,7 +6388,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28734,8 +28655,7 @@
+@@ -28823,8 +28743,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10248,7 +6398,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28828,8 +28748,7 @@
+@@ -28917,8 +28836,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10258,7 +6408,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29003,8 +28922,7 @@
+@@ -29092,8 +29010,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10268,7 +6418,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29102,8 +29020,7 @@
+@@ -29191,8 +29108,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10278,7 +6428,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29196,8 +29113,7 @@
+@@ -29285,8 +29201,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10288,7 +6438,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29280,8 +29196,7 @@
+@@ -29369,8 +29284,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10298,25 +6448,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29334,7 +29249,7 @@
+@@ -29423,7 +29337,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29337: $i/$j" >&5
-+    echo "configure: 29252: $i/$j" >&5
+-    echo "configure: 29426: $i/$j" >&5
++    echo "configure: 29340: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29642,7 +29557,7 @@
+@@ -29731,7 +29645,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29645: $i/$j" >&5
-+    echo "configure: 29560: $i/$j" >&5
+-    echo "configure: 29734: $i/$j" >&5
++    echo "configure: 29648: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30319,8 +30234,7 @@
+@@ -30408,8 +30322,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10326,43 +6476,43 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30479,7 +30393,7 @@
+@@ -30568,7 +30481,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30482: $i/$j" >&5
-+    echo "configure: 30396: $i/$j" >&5
+-    echo "configure: 30571: $i/$j" >&5
++    echo "configure: 30484: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30509,7 +30423,7 @@
+@@ -30598,7 +30511,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30512: $i/$j" >&5
-+    echo "configure: 30426: $i/$j" >&5
+-    echo "configure: 30601: $i/$j" >&5
++    echo "configure: 30514: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30527,7 +30441,7 @@
+@@ -30616,7 +30529,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30530: $i/$j" >&5
-+    echo "configure: 30444: $i/$j" >&5
+-    echo "configure: 30619: $i/$j" >&5
++    echo "configure: 30532: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32029,7 +31943,7 @@
+@@ -32134,7 +32047,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32032: $i/$j" >&5
-+    echo "configure: 31946: $i/$j" >&5
+-    echo "configure: 32137: $i/$j" >&5
++    echo "configure: 32050: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32225,8 +32139,7 @@
+@@ -32330,8 +32243,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10372,7 +6522,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32313,8 +32226,7 @@
+@@ -32418,8 +32330,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10382,7 +6532,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32401,8 +32313,7 @@
+@@ -32506,8 +32417,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10392,7 +6542,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32489,8 +32400,7 @@
+@@ -32594,8 +32504,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10402,17 +6552,27 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32581,8 +32491,7 @@
+@@ -32688,8 +32597,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32786,8 +32694,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 +	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32732,8 +32641,7 @@
+@@ -32937,8 +32844,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10422,7 +6582,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32882,8 +32790,7 @@
+@@ -33087,8 +32993,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10432,7 +6592,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33036,8 +32943,7 @@
+@@ -33241,8 +33146,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10442,7 +6602,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33191,8 +33097,7 @@
+@@ -33396,8 +33300,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10452,7 +6612,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33344,8 +33249,7 @@
+@@ -33549,8 +33452,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10462,7 +6622,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33484,8 +33388,7 @@
+@@ -33689,8 +33591,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10472,7 +6632,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33562,8 +33465,7 @@
+@@ -33767,8 +33668,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10482,7 +6642,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33592,8 +33494,7 @@
+@@ -33797,8 +33697,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10492,7 +6652,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33663,8 +33564,7 @@
+@@ -33868,8 +33767,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10502,7 +6662,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33716,8 +33616,7 @@
+@@ -33921,8 +33819,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10512,7 +6672,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33788,8 +33687,7 @@
+@@ -33993,8 +33890,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10522,7 +6682,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33841,8 +33739,7 @@
+@@ -34046,8 +33942,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10532,7 +6692,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33953,8 +33850,7 @@
+@@ -34158,8 +34053,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10542,7 +6702,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34008,9 +33904,6 @@
+@@ -34213,9 +34107,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10552,7 +6712,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34043,8 +33936,7 @@
+@@ -34248,8 +34139,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10562,7 +6722,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34147,8 +34039,7 @@
+@@ -34352,8 +34242,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10572,7 +6732,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34279,8 +34170,7 @@
+@@ -34484,8 +34373,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10582,7 +6742,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34334,9 +34224,6 @@
+@@ -34539,9 +34427,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10592,7 +6752,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34367,8 +34254,7 @@
+@@ -34572,8 +34457,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10602,7 +6762,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34469,8 +34355,7 @@
+@@ -34674,8 +34558,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10612,7 +6772,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34549,9 +34434,6 @@
+@@ -34754,9 +34637,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10622,7 +6782,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34582,8 +34464,7 @@
+@@ -34787,8 +34667,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10632,7 +6792,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34684,8 +34565,7 @@
+@@ -34889,8 +34768,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10642,7 +6802,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34764,9 +34644,6 @@
+@@ -34969,9 +34847,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10652,7 +6812,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34802,8 +34679,7 @@
+@@ -35007,8 +34882,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10662,7 +6822,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34910,8 +34786,7 @@
+@@ -35115,8 +34989,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10672,7 +6832,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34990,9 +34865,6 @@
+@@ -35195,9 +35068,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10682,7 +6842,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35027,8 +34899,7 @@
+@@ -35232,8 +35102,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10692,7 +6852,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35133,8 +35004,7 @@
+@@ -35338,8 +35207,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10702,7 +6862,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35226,8 +35096,7 @@
+@@ -35431,8 +35299,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10712,7 +6872,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35269,8 +35138,7 @@
+@@ -35474,8 +35341,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10722,7 +6882,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35327,8 +35195,7 @@
+@@ -35532,8 +35398,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10732,7 +6892,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35487,8 +35354,7 @@
+@@ -35692,8 +35557,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10742,7 +6902,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35552,8 +35418,7 @@
+@@ -35757,8 +35621,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10752,7 +6912,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35618,8 +35483,7 @@
+@@ -35823,8 +35686,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10762,7 +6922,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35683,8 +35547,7 @@
+@@ -35888,8 +35750,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10772,7 +6932,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35760,8 +35623,7 @@
+@@ -35965,8 +35826,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10782,16 +6942,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35852,7 +35714,7 @@
+@@ -36057,7 +35917,7 @@
  do
    for j in qsql.html;
    do
--    echo "configure: 35855: $i/$j" >&5
-+    echo "configure: 35717: $i/$j" >&5
+-    echo "configure: 36060: $i/$j" >&5
++    echo "configure: 35920: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -36042,8 +35904,7 @@
+@@ -36247,8 +36107,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10801,7 +6961,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36125,8 +35986,7 @@
+@@ -36330,8 +36189,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10811,7 +6971,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36580,8 +36440,7 @@
+@@ -36785,8 +36643,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10821,7 +6981,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36651,8 +36510,7 @@
+@@ -36856,8 +36713,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10831,7 +6991,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36714,8 +36572,7 @@
+@@ -36919,8 +36775,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10841,7 +7001,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36755,8 +36612,7 @@
+@@ -36960,8 +36815,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10851,7 +7011,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36812,8 +36668,7 @@
+@@ -37017,8 +36871,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10861,7 +7021,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36853,8 +36708,7 @@
+@@ -37058,8 +36911,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10871,7 +7031,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36918,8 +36772,7 @@
+@@ -37123,8 +36975,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10881,7 +7041,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36950,10 +36803,8 @@
+@@ -37155,10 +37006,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10894,7 +7054,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37064,8 +36915,7 @@
+@@ -37269,8 +37118,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10904,7 +7064,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37127,8 +36977,7 @@
+@@ -37332,8 +37180,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10914,7 +7074,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37168,8 +37017,7 @@
+@@ -37373,8 +37220,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10924,7 +7084,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37225,8 +37073,7 @@
+@@ -37430,8 +37276,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10934,7 +7094,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37266,8 +37113,7 @@
+@@ -37471,8 +37316,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10944,7 +7104,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37331,8 +37177,7 @@
+@@ -37536,8 +37380,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10954,7 +7114,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37363,10 +37208,8 @@
+@@ -37568,10 +37411,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10967,7 +7127,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37477,8 +37320,7 @@
+@@ -37682,8 +37523,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10977,7 +7137,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37540,8 +37382,7 @@
+@@ -37745,8 +37585,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10987,7 +7147,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37581,8 +37422,7 @@
+@@ -37786,8 +37625,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10997,7 +7157,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37638,8 +37478,7 @@
+@@ -37843,8 +37681,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11007,7 +7167,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37679,8 +37518,7 @@
+@@ -37884,8 +37721,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11017,7 +7177,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37744,8 +37582,7 @@
+@@ -37949,8 +37785,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11027,7 +7187,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37776,10 +37613,8 @@
+@@ -37981,10 +37816,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11040,7 +7200,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37890,8 +37725,7 @@
+@@ -38095,8 +37928,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11050,7 +7210,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37953,8 +37787,7 @@
+@@ -38158,8 +37990,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11060,7 +7220,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37994,8 +37827,7 @@
+@@ -38199,8 +38030,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11070,7 +7230,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38051,8 +37883,7 @@
+@@ -38256,8 +38086,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11080,7 +7240,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38092,8 +37923,7 @@
+@@ -38297,8 +38126,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11090,7 +7250,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38157,8 +37987,7 @@
+@@ -38362,8 +38190,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11100,7 +7260,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38189,10 +38018,8 @@
+@@ -38394,10 +38221,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11113,7 +7273,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -38327,8 +38154,7 @@
+@@ -38532,8 +38357,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11123,7 +7283,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38497,8 +38323,7 @@
+@@ -38702,8 +38526,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11133,7 +7293,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38576,8 +38401,7 @@
+@@ -38781,8 +38604,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11143,7 +7303,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38736,8 +38560,7 @@
+@@ -38941,8 +38763,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11153,7 +7313,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38800,8 +38623,7 @@
+@@ -39005,8 +38826,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11163,7 +7323,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38883,8 +38705,7 @@
+@@ -39088,8 +38908,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11173,7 +7333,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38964,8 +38785,7 @@
+@@ -39169,8 +38988,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11183,7 +7343,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39085,8 +38905,7 @@
+@@ -39290,8 +39108,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11193,7 +7353,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39338,8 +39157,7 @@
+@@ -39543,8 +39360,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11203,16 +7363,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39428,7 +39246,7 @@
+@@ -39633,7 +39449,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 39431: $i/$j" >&5
-+    echo "configure: 39249: $i/$j" >&5
+-    echo "configure: 39636: $i/$j" >&5
++    echo "configure: 39452: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -39483,8 +39301,7 @@
+@@ -39688,8 +39504,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11222,7 +7382,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39800,8 +39617,7 @@
+@@ -40005,8 +39820,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11232,7 +7392,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39906,8 +39722,7 @@
+@@ -40111,8 +39925,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11242,7 +7402,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40006,8 +39821,7 @@
+@@ -40211,8 +40024,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11252,7 +7412,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40177,8 +39991,7 @@
+@@ -40382,8 +40194,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11262,7 +7422,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40392,8 +40205,7 @@
+@@ -40597,8 +40408,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11272,7 +7432,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40435,8 +40247,7 @@
+@@ -40640,8 +40450,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11282,7 +7442,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40493,8 +40304,7 @@
+@@ -40698,8 +40507,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11292,7 +7452,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40662,8 +40472,7 @@
+@@ -40867,8 +40675,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11302,7 +7462,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40723,8 +40532,7 @@
+@@ -40928,8 +40735,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11312,7 +7472,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40797,8 +40605,7 @@
+@@ -41002,8 +40808,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11322,7 +7482,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40862,8 +40669,7 @@
+@@ -41067,8 +40872,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11332,7 +7492,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40927,8 +40733,7 @@
+@@ -41132,8 +40936,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11342,7 +7502,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40993,8 +40798,7 @@
+@@ -41198,8 +41001,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11352,7 +7512,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41059,8 +40863,7 @@
+@@ -41264,8 +41066,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11362,7 +7522,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41163,8 +40966,7 @@
+@@ -41368,8 +41169,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11372,7 +7532,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41303,8 +41105,7 @@
+@@ -41508,8 +41308,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11382,7 +7542,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41370,8 +41171,7 @@
+@@ -41575,8 +41374,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11392,7 +7552,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41527,8 +41327,7 @@
+@@ -41732,8 +41530,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11402,7 +7562,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41558,7 +41357,7 @@
+@@ -41763,7 +41560,7 @@
  #define HAVE_VIDMODE_EXTENSION 1
  _ACEOF
  
@@ -11411,16 +7571,16 @@
  
  fi
  
-@@ -41615,7 +41414,7 @@
+@@ -41820,7 +41617,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 41618: $i/$j" >&5
-+    echo "configure: 41417: $i/$j" >&5
+-    echo "configure: 41823: $i/$j" >&5
++    echo "configure: 41620: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -41670,8 +41469,7 @@
+@@ -41875,8 +41672,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11430,7 +7590,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41904,8 +41702,7 @@
+@@ -42109,8 +41905,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11440,7 +7600,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42062,8 +41859,7 @@
+@@ -42267,8 +42062,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11450,7 +7610,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42242,8 +42038,7 @@
+@@ -42447,8 +42241,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11460,7 +7620,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42309,8 +42104,7 @@
+@@ -42514,8 +42307,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11470,7 +7630,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42459,8 +42253,7 @@
+@@ -42664,8 +42456,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11480,7 +7640,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42542,8 +42335,7 @@
+@@ -42747,8 +42538,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11490,7 +7650,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42649,8 +42441,7 @@
+@@ -42854,8 +42644,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11500,7 +7660,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42716,8 +42507,7 @@
+@@ -42921,8 +42710,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11510,7 +7670,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42763,8 +42553,7 @@
+@@ -42968,8 +42756,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11520,7 +7680,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42841,8 +42630,7 @@
+@@ -43046,8 +42833,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11530,7 +7690,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42908,8 +42696,7 @@
+@@ -43113,8 +42899,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11540,7 +7700,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42969,8 +42756,7 @@
+@@ -43174,8 +42959,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11550,7 +7710,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43954,6 +43740,13 @@
+@@ -44159,6 +43943,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -11564,7 +7724,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
-@@ -45056,6 +44849,9 @@
+@@ -45261,6 +45052,9 @@
  s,@AMTAR@,$AMTAR,;t t
  s,@am__tar@,$am__tar,;t t
  s,@am__untar@,$am__untar,;t t
@@ -11574,7 +7734,7 @@
  s,@KDECONFIG@,$KDECONFIG,;t t
  s,@kde_libs_prefix@,$kde_libs_prefix,;t t
  s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -45481,11 +45277,6 @@
+@@ -45686,11 +45480,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -11586,7 +7746,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.  */
-@@ -45524,6 +45315,12 @@
+@@ -45729,6 +45518,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -11599,12 +7759,12 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-diff -Nrua kdenetwork-3.4.0.orig/configure.in kdenetwork-3.4.0/configure.in
---- kdenetwork-3.4.0.orig/configure.in	2005-03-04 12:35:00.000000000 +0000
-+++ kdenetwork-3.4.0/configure.in	2005-03-05 23:22:08.971383488 +0000
+diff -Nrua kdenetwork-3.4.1.orig/configure.in kdenetwork-3.4.1/configure.in
+--- kdenetwork-3.4.1.orig/configure.in	2005-05-23 18:06:48.000000000 +0200
++++ kdenetwork-3.4.1/configure.in	2005-05-24 17:05:18.000000000 +0200
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdenetwork, "3.4.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdenetwork, "3.4.1") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -11620,44 +7780,9 @@
  ], ,
  [
  #include <X11/Xlib.h>
-diff -Nrua kdenetwork-3.4.0.orig/dcoprss/Makefile.in kdenetwork-3.4.0/dcoprss/Makefile.in
---- kdenetwork-3.4.0.orig/dcoprss/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/dcoprss/Makefile.in	2005-03-05 23:23:46.283589784 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -92,18 +92,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(feedbrowser_SOURCES) $(rssclient_SOURCES) \
- 	$(rssservice_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/dcoprss/Makefile.in kdenetwork-3.4.1/dcoprss/Makefile.in
+--- kdenetwork-3.4.1.orig/dcoprss/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/dcoprss/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -259,6 +259,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11689,22 +7814,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/doc/Makefile.in kdenetwork-3.4.0/doc/Makefile.in
---- kdenetwork-3.4.0.orig/doc/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/Makefile.in	2005-03-05 23:23:46.291588568 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/doc/kcontrol/kcmktalkd/Makefile.in kdenetwork-3.4.1/doc/kcontrol/kcmktalkd/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kcontrol/kcmktalkd/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/kcontrol/kcmktalkd/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11714,8 +7827,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
- all: docs-am  all-recursive
+@@ -381,7 +384,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -11723,7 +7836,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -438,9 +441,9 @@
+@@ -419,9 +422,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11735,163 +7848,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -460,7 +463,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -472,7 +481,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -480,7 +489,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -501,7 +516,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/doc/kcontrol/Makefile.in kdenetwork-3.4.0/doc/kcontrol/Makefile.in
---- kdenetwork-3.4.0.orig/doc/kcontrol/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/kcontrol/Makefile.in	2005-03-05 23:23:46.299587352 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -438,9 +441,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -460,7 +463,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -472,7 +481,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -480,7 +489,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -501,7 +516,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/doc/kcontrol/kcmktalkd/Makefile.in kdenetwork-3.4.0/doc/kcontrol/kcmktalkd/Makefile.in
---- kdenetwork-3.4.0.orig/doc/kcontrol/kcmktalkd/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/kcontrol/kcmktalkd/Makefile.in	2005-03-05 23:23:46.305586440 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/kcontrol/lanbrowser/Makefile.in kdenetwork-3.4.1/doc/kcontrol/lanbrowser/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kcontrol/lanbrowser/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/kcontrol/lanbrowser/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11923,22 +7882,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/kcontrol/lanbrowser/Makefile.in kdenetwork-3.4.0/doc/kcontrol/lanbrowser/Makefile.in
---- kdenetwork-3.4.0.orig/doc/kcontrol/lanbrowser/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/kcontrol/lanbrowser/Makefile.in	2005-03-05 23:23:46.311585528 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -188,6 +188,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/doc/kcontrol/Makefile.in kdenetwork-3.4.1/doc/kcontrol/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kcontrol/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/kcontrol/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11948,8 +7895,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
- all: docs-am  all-am
+@@ -400,7 +403,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -11957,7 +7904,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -438,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11969,21 +7916,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/kdict/Makefile.in kdenetwork-3.4.0/doc/kdict/Makefile.in
---- kdenetwork-3.4.0.orig/doc/kdict/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/kdict/Makefile.in	2005-03-05 23:23:46.317584616 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/kdict/Makefile.in kdenetwork-3.4.1/doc/kdict/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kdict/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/kdict/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12015,21 +7950,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/kget/Makefile.in kdenetwork-3.4.0/doc/kget/Makefile.in
---- kdenetwork-3.4.0.orig/doc/kget/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/kget/Makefile.in	2005-03-05 23:23:46.324583552 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/kget/Makefile.in kdenetwork-3.4.1/doc/kget/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kget/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/kget/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12061,21 +7984,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/knewsticker/Makefile.in kdenetwork-3.4.0/doc/knewsticker/Makefile.in
---- kdenetwork-3.4.0.orig/doc/knewsticker/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/knewsticker/Makefile.in	2005-03-05 23:23:46.331582488 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/knewsticker/Makefile.in kdenetwork-3.4.1/doc/knewsticker/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/knewsticker/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/knewsticker/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12107,21 +8018,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/kopete/Makefile.in kdenetwork-3.4.0/doc/kopete/Makefile.in
---- kdenetwork-3.4.0.orig/doc/kopete/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/kopete/Makefile.in	2005-03-05 23:23:46.339581272 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/kopete/Makefile.in kdenetwork-3.4.1/doc/kopete/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kopete/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/kopete/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12153,21 +8052,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/kpf/Makefile.in kdenetwork-3.4.0/doc/kpf/Makefile.in
---- kdenetwork-3.4.0.orig/doc/kpf/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/kpf/Makefile.in	2005-03-05 23:23:46.345580360 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/kpf/Makefile.in kdenetwork-3.4.1/doc/kpf/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kpf/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/kpf/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12199,21 +8086,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/kppp/Makefile.in kdenetwork-3.4.0/doc/kppp/Makefile.in
---- kdenetwork-3.4.0.orig/doc/kppp/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/kppp/Makefile.in	2005-03-05 23:23:46.352579296 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/kppp/Makefile.in kdenetwork-3.4.1/doc/kppp/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kppp/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/kppp/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12245,21 +8120,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/krdc/Makefile.in kdenetwork-3.4.0/doc/krdc/Makefile.in
---- kdenetwork-3.4.0.orig/doc/krdc/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/krdc/Makefile.in	2005-03-05 23:23:46.359578232 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/krdc/Makefile.in kdenetwork-3.4.1/doc/krdc/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/krdc/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/krdc/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12291,21 +8154,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/krfb/Makefile.in kdenetwork-3.4.0/doc/krfb/Makefile.in
---- kdenetwork-3.4.0.orig/doc/krfb/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/krfb/Makefile.in	2005-03-05 23:23:46.367577016 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/krfb/Makefile.in kdenetwork-3.4.1/doc/krfb/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/krfb/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/krfb/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12337,21 +8188,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/ksirc/Makefile.in kdenetwork-3.4.0/doc/ksirc/Makefile.in
---- kdenetwork-3.4.0.orig/doc/ksirc/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/ksirc/Makefile.in	2005-03-05 23:23:46.373576104 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/ksirc/Makefile.in kdenetwork-3.4.1/doc/ksirc/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/ksirc/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/ksirc/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12383,21 +8222,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/ktalkd/Makefile.in kdenetwork-3.4.0/doc/ktalkd/Makefile.in
---- kdenetwork-3.4.0.orig/doc/ktalkd/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/ktalkd/Makefile.in	2005-03-05 23:23:46.380575040 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/ktalkd/Makefile.in kdenetwork-3.4.1/doc/ktalkd/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/ktalkd/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/ktalkd/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12429,21 +8256,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/kwifimanager/Makefile.in kdenetwork-3.4.0/doc/kwifimanager/Makefile.in
---- kdenetwork-3.4.0.orig/doc/kwifimanager/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/kwifimanager/Makefile.in	2005-03-05 23:23:46.388573824 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/kwifimanager/Makefile.in kdenetwork-3.4.1/doc/kwifimanager/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kwifimanager/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/kwifimanager/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12475,21 +8290,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/doc/lisa/Makefile.in kdenetwork-3.4.0/doc/lisa/Makefile.in
---- kdenetwork-3.4.0.orig/doc/lisa/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/doc/lisa/Makefile.in	2005-03-05 23:23:46.394572912 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/lisa/Makefile.in kdenetwork-3.4.1/doc/lisa/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/lisa/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/lisa/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12521,21 +8324,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/filesharing/Makefile.in kdenetwork-3.4.0/filesharing/Makefile.in
---- kdenetwork-3.4.0.orig/filesharing/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/filesharing/Makefile.in	2005-03-05 23:23:46.401571848 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/doc/Makefile.in kdenetwork-3.4.1/doc/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/doc/Makefile.in	2005-05-24 17:07:05.000000000 +0200
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12546,7 +8337,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -400,7 +403,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -12555,7 +8346,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -438,9 +441,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12567,70 +8358,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/filesharing/advanced/Makefile.in kdenetwork-3.4.0/filesharing/advanced/Makefile.in
---- kdenetwork-3.4.0.orig/filesharing/advanced/Makefile.in	2005-03-04 12:37:13.000000000 +0000
-+++ kdenetwork-3.4.0/filesharing/advanced/Makefile.in	2005-03-05 23:23:46.407570936 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/filesharing/advanced/kcm_sambaconf/Makefile.in kdenetwork-3.4.1/filesharing/advanced/kcm_sambaconf/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/advanced/kcm_sambaconf/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/filesharing/advanced/kcm_sambaconf/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -254,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12640,16 +8371,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am  all-recursive
+@@ -516,7 +519,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -554,9 +557,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12659,95 +8390,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/filesharing/advanced/kcm_sambaconf/Makefile.in kdenetwork-3.4.0/filesharing/advanced/kcm_sambaconf/Makefile.in
---- kdenetwork-3.4.0.orig/filesharing/advanced/kcm_sambaconf/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/filesharing/advanced/kcm_sambaconf/Makefile.in	2005-03-05 23:23:46.474560752 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,18 +94,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libfilesharesamba_la_SOURCES) \
- 	$(libkcm_kcmsambaconf_la_SOURCES)
-@@ -254,6 +254,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/filesharing/advanced/Makefile.in kdenetwork-3.4.1/filesharing/advanced/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/advanced/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/filesharing/advanced/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12757,16 +8405,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -434,9 +437,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12776,46 +8424,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/filesharing/advanced/nfs/Makefile.in kdenetwork-3.4.0/filesharing/advanced/nfs/Makefile.in
---- kdenetwork-3.4.0.orig/filesharing/advanced/nfs/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/filesharing/advanced/nfs/Makefile.in	2005-03-05 23:23:46.488558624 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libfilesharenfs_la_SOURCES)
- DIST_SOURCES = $(libfilesharenfs_la_SOURCES)
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/filesharing/advanced/nfs/Makefile.in kdenetwork-3.4.1/filesharing/advanced/nfs/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/advanced/nfs/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/filesharing/advanced/nfs/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -225,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12847,44 +8460,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/filesharing/advanced/propsdlgplugin/Makefile.in kdenetwork-3.4.0/filesharing/advanced/propsdlgplugin/Makefile.in
---- kdenetwork-3.4.0.orig/filesharing/advanced/propsdlgplugin/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/filesharing/advanced/propsdlgplugin/Makefile.in	2005-03-05 23:23:46.508555584 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -87,18 +87,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(fileshare_propsdlgplugin_la_SOURCES) \
- 	$(libpropsdlgplugin_common_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/filesharing/advanced/propsdlgplugin/Makefile.in kdenetwork-3.4.1/filesharing/advanced/propsdlgplugin/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/advanced/propsdlgplugin/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/filesharing/advanced/propsdlgplugin/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12916,45 +8494,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/filesharing/simple/Makefile.in kdenetwork-3.4.0/filesharing/simple/Makefile.in
---- kdenetwork-3.4.0.orig/filesharing/simple/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/filesharing/simple/Makefile.in	2005-03-05 23:23:46.526552848 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_fileshare_la_SOURCES)
- DIST_SOURCES = $(kcm_fileshare_la_SOURCES)
-@@ -242,6 +242,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/filesharing/Makefile.in kdenetwork-3.4.1/filesharing/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/filesharing/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12964,16 +8507,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -458,7 +461,7 @@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -496,9 +499,9 @@
+@@ -434,9 +437,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12983,47 +8526,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kdict/Makefile.in kdenetwork-3.4.0/kdict/Makefile.in
---- kdenetwork-3.4.0.orig/kdict/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/kdict/Makefile.in	2005-03-05 23:23:46.614539472 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdict_SOURCES)
- DIST_SOURCES = $(kdict_SOURCES)
-@@ -260,6 +260,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/filesharing/simple/Makefile.in kdenetwork-3.4.1/filesharing/simple/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/simple/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/filesharing/simple/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -242,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13033,7 +8541,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -487,7 +490,7 @@
+@@ -458,7 +461,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13042,7 +8550,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -525,9 +528,9 @@
+@@ -496,9 +499,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13052,94 +8560,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -649,7 +652,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -661,7 +670,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -669,7 +678,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -690,7 +705,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kdict/applet/Makefile.in kdenetwork-3.4.0/kdict/applet/Makefile.in
---- kdenetwork-3.4.0.orig/kdict/applet/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/kdict/applet/Makefile.in	2005-03-05 23:23:46.628537344 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kdict_panelapplet_la_SOURCES)
- DIST_SOURCES = $(kdict_panelapplet_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kdict/applet/Makefile.in kdenetwork-3.4.1/kdict/applet/Makefile.in
+--- kdenetwork-3.4.1.orig/kdict/applet/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kdict/applet/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13171,22 +8596,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kdict/pics/Makefile.in kdenetwork-3.4.0/kdict/pics/Makefile.in
---- kdenetwork-3.4.0.orig/kdict/pics/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/kdict/pics/Makefile.in	2005-03-05 23:23:46.635536280 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -188,6 +188,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kdict/Makefile.in kdenetwork-3.4.1/kdict/Makefile.in
+--- kdenetwork-3.4.1.orig/kdict/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kdict/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13196,16 +8609,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
- all: docs-am  all-am
+@@ -487,7 +490,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -525,9 +528,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13215,24 +8628,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kdnssd/Makefile.in kdenetwork-3.4.0/kdnssd/Makefile.in
---- kdenetwork-3.4.0.orig/kdnssd/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/kdnssd/Makefile.in	2005-03-05 23:23:46.642535216 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kdict/pics/Makefile.in kdenetwork-3.4.1/kdict/pics/Makefile.in
+--- kdenetwork-3.4.1.orig/kdict/pics/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kdict/pics/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13242,8 +8643,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am  all-recursive
+@@ -381,7 +384,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -13251,7 +8652,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -419,9 +422,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13263,92 +8664,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kdnssd/ioslave/Makefile.in kdenetwork-3.4.0/kdnssd/ioslave/Makefile.in
---- kdenetwork-3.4.0.orig/kdnssd/ioslave/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/kdnssd/ioslave/Makefile.in	2005-03-05 23:23:46.655533240 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_zeroconf_la_SOURCES)
- DIST_SOURCES = $(kio_zeroconf_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kdnssd/ioslave/Makefile.in kdenetwork-3.4.1/kdnssd/ioslave/Makefile.in
+--- kdenetwork-3.4.1.orig/kdnssd/ioslave/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kdnssd/ioslave/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13380,44 +8698,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kdnssd/kdedmodule/Makefile.in kdenetwork-3.4.0/kdnssd/kdedmodule/Makefile.in
---- kdenetwork-3.4.0.orig/kdnssd/kdedmodule/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/kdnssd/kdedmodule/Makefile.in	2005-03-05 23:23:46.668531264 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_dnssdwatcher_la_SOURCES)
- DIST_SOURCES = $(kded_dnssdwatcher_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kdnssd/kdedmodule/Makefile.in kdenetwork-3.4.1/kdnssd/kdedmodule/Makefile.in
+--- kdenetwork-3.4.1.orig/kdnssd/kdedmodule/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kdnssd/kdedmodule/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13449,21 +8732,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kfile-plugins/Makefile.in kdenetwork-3.4.0/kfile-plugins/Makefile.in
---- kdenetwork-3.4.0.orig/kfile-plugins/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/kfile-plugins/Makefile.in	2005-03-05 23:23:46.674530352 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kdnssd/Makefile.in kdenetwork-3.4.1/kdnssd/Makefile.in
+--- kdenetwork-3.4.1.orig/kdnssd/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kdnssd/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13495,93 +8766,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kfile-plugins/torrent/Makefile.in kdenetwork-3.4.0/kfile-plugins/torrent/Makefile.in
---- kdenetwork-3.4.0.orig/kfile-plugins/torrent/Makefile.in	2005-03-04 12:37:14.000000000 +0000
-+++ kdenetwork-3.4.0/kfile-plugins/torrent/Makefile.in	2005-03-05 23:23:46.690527920 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_torrent_la_SOURCES)
- DIST_SOURCES = $(kfile_torrent_la_SOURCES)
-@@ -241,6 +241,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kfile-plugins/Makefile.in kdenetwork-3.4.1/kfile-plugins/Makefile.in
+--- kdenetwork-3.4.1.orig/kfile-plugins/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kfile-plugins/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13591,16 +8779,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,7 +451,7 @@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -486,9 +489,9 @@
+@@ -434,9 +437,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13610,47 +8798,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kget/Makefile.in kdenetwork-3.4.0/kget/Makefile.in
---- kdenetwork-3.4.0.orig/kget/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kget/Makefile.in	2005-03-05 23:23:46.793512264 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -92,18 +92,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kget_SOURCES)
- DIST_SOURCES = $(kget_SOURCES)
-@@ -273,6 +273,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kfile-plugins/torrent/Makefile.in kdenetwork-3.4.1/kfile-plugins/torrent/Makefile.in
+--- kdenetwork-3.4.1.orig/kfile-plugins/torrent/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kfile-plugins/torrent/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13660,7 +8813,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -505,7 +508,7 @@
+@@ -448,7 +451,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13669,7 +8822,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -543,9 +546,9 @@
+@@ -486,9 +489,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13679,71 +8832,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -697,7 +700,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -709,7 +718,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -717,7 +726,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -738,7 +753,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kget/icons/Makefile.in kdenetwork-3.4.0/kget/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kget/icons/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kget/icons/Makefile.in	2005-03-05 23:23:46.803510744 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kget/icons/Makefile.in kdenetwork-3.4.1/kget/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kget/icons/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kget/icons/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13775,44 +8868,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kget/kget_plug_in/Makefile.in kdenetwork-3.4.0/kget/kget_plug_in/Makefile.in
---- kdenetwork-3.4.0.orig/kget/kget_plug_in/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kget/kget_plug_in/Makefile.in	2005-03-05 23:23:46.816508768 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(khtml_kget_la_SOURCES)
- DIST_SOURCES = $(khtml_kget_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kget/kget_plug_in/Makefile.in kdenetwork-3.4.1/kget/kget_plug_in/Makefile.in
+--- kdenetwork-3.4.1.orig/kget/kget_plug_in/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kget/kget_plug_in/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -235,6 +235,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13844,22 +8902,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kget/pics/Makefile.in kdenetwork-3.4.0/kget/pics/Makefile.in
---- kdenetwork-3.4.0.orig/kget/pics/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kget/pics/Makefile.in	2005-03-05 23:23:46.823507704 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -198,6 +198,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kget/Makefile.in kdenetwork-3.4.1/kget/Makefile.in
+--- kdenetwork-3.4.1.orig/kget/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kget/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -273,6 +273,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13869,16 +8915,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am  all-am
+@@ -505,7 +508,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
+@@ -543,9 +546,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13888,23 +8934,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kget/sounds/Makefile.in kdenetwork-3.4.0/kget/sounds/Makefile.in
---- kdenetwork-3.4.0.orig/kget/sounds/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kget/sounds/Makefile.in	2005-03-05 23:23:46.829506792 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kget/pics/Makefile.in kdenetwork-3.4.1/kget/pics/Makefile.in
+--- kdenetwork-3.4.1.orig/kget/pics/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kget/pics/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13915,7 +8949,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
+@@ -398,7 +401,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13924,7 +8958,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -436,9 +439,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13936,45 +8970,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/knewsticker/Makefile.in kdenetwork-3.4.0/knewsticker/Makefile.in
---- kdenetwork-3.4.0.orig/knewsticker/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/knewsticker/Makefile.in	2005-03-05 23:23:46.863501624 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,18 +90,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(knewsticker_panelapplet_la_SOURCES)
- DIST_SOURCES = $(knewsticker_panelapplet_la_SOURCES)
-@@ -266,6 +266,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kget/sounds/Makefile.in kdenetwork-3.4.1/kget/sounds/Makefile.in
+--- kdenetwork-3.4.1.orig/kget/sounds/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kget/sounds/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13984,16 +8983,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -392,7 +395,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -524,9 +527,9 @@
+@@ -430,9 +433,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14003,94 +9002,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -697,7 +700,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -709,7 +718,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -717,7 +726,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -738,7 +753,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/knewsticker/common/Makefile.in kdenetwork-3.4.0/knewsticker/common/Makefile.in
---- kdenetwork-3.4.0.orig/knewsticker/common/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/knewsticker/common/Makefile.in	2005-03-05 23:23:46.878499344 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libknewstickercommon_la_SOURCES)
- DIST_SOURCES = $(libknewstickercommon_la_SOURCES)
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/knewsticker/common/Makefile.in kdenetwork-3.4.1/knewsticker/common/Makefile.in
+--- kdenetwork-3.4.1.orig/knewsticker/common/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/knewsticker/common/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -231,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14122,44 +9038,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/knewsticker/knewstickerstub/Makefile.in kdenetwork-3.4.0/knewsticker/knewstickerstub/Makefile.in
---- kdenetwork-3.4.0.orig/knewsticker/knewstickerstub/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/knewsticker/knewstickerstub/Makefile.in	2005-03-05 23:23:46.899496152 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -70,18 +70,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(knewstickerstub_SOURCES)
- DIST_SOURCES = $(knewstickerstub_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/knewsticker/knewstickerstub/Makefile.in kdenetwork-3.4.1/knewsticker/knewstickerstub/Makefile.in
+--- kdenetwork-3.4.1.orig/knewsticker/knewstickerstub/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/knewsticker/knewstickerstub/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -234,6 +234,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14191,44 +9072,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in kdenetwork-3.4.0/knewsticker/kntsrcfilepropsdlg/Makefile.in
---- kdenetwork-3.4.0.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/knewsticker/kntsrcfilepropsdlg/Makefile.in	2005-03-05 23:23:46.911494328 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkntsrcfilepropsdlg_la_SOURCES)
- DIST_SOURCES = $(libkntsrcfilepropsdlg_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in kdenetwork-3.4.1/knewsticker/kntsrcfilepropsdlg/Makefile.in
+--- kdenetwork-3.4.1.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/knewsticker/kntsrcfilepropsdlg/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14260,22 +9106,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/Makefile.in kdenetwork-3.4.0/kopete/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/Makefile.in	2005-03-05 23:23:46.918493264 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -205,6 +205,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/knewsticker/Makefile.in kdenetwork-3.4.1/knewsticker/Makefile.in
+--- kdenetwork-3.4.1.orig/knewsticker/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/knewsticker/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -266,6 +266,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14285,16 +9119,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -397,7 +400,7 @@
- all: docs-am  all-recursive
+@@ -486,7 +489,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -435,9 +438,9 @@
+@@ -524,9 +527,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14304,71 +9138,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -457,7 +460,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -469,7 +478,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -477,7 +486,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -498,7 +513,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/icons/Makefile.in kdenetwork-3.4.0/kopete/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/icons/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/icons/Makefile.in	2005-03-05 23:23:46.928491744 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/icons/Makefile.in kdenetwork-3.4.1/kopete/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/icons/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kopete/icons/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14400,45 +9174,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/kopete/Makefile.in kdenetwork-3.4.0/kopete/kopete/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/kopete/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/kopete/Makefile.in	2005-03-05 23:23:46.959487032 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_SOURCES)
- DIST_SOURCES = $(kopete_SOURCES)
-@@ -264,6 +264,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/addcontactwizard/Makefile.in kdenetwork-3.4.1/kopete/kopete/addcontactwizard/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/addcontactwizard/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kopete/kopete/addcontactwizard/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -230,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14448,7 +9187,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -506,7 +509,7 @@
+@@ -433,7 +436,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14457,7 +9196,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -544,9 +547,9 @@
+@@ -471,9 +474,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14467,95 +9206,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-@@ -684,7 +687,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -696,7 +705,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -704,7 +713,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -725,7 +740,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/kopete/addcontactwizard/Makefile.in kdenetwork-3.4.0/kopete/kopete/addcontactwizard/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/kopete/addcontactwizard/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/kopete/addcontactwizard/Makefile.in	2005-03-05 23:23:46.973484904 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopeteaddcontactwizard_la_SOURCES)
- DIST_SOURCES = $(libkopeteaddcontactwizard_la_SOURCES)
-@@ -230,6 +230,9 @@
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/chatwindow/Makefile.in kdenetwork-3.4.1/kopete/kopete/chatwindow/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/chatwindow/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kopete/kopete/chatwindow/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -270,6 +270,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14565,7 +9221,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -488,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14574,7 +9230,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -526,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14584,47 +9240,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/kopete/chatwindow/Makefile.in kdenetwork-3.4.0/kopete/kopete/chatwindow/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/kopete/chatwindow/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/kopete/chatwindow/Makefile.in	2005-03-05 23:23:47.037475176 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -106,18 +106,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_chatwindow_la_SOURCES) \
- 	$(kopete_emailwindow_la_SOURCES) \
-@@ -270,6 +270,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/config/accounts/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/accounts/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/config/accounts/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/kopete/config/accounts/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14634,7 +9255,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -445,7 +448,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14643,7 +9264,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -483,9 +486,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14655,22 +9276,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/kopete/config/Makefile.in kdenetwork-3.4.0/kopete/kopete/config/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/kopete/config/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/kopete/config/Makefile.in	2005-03-05 23:23:47.043474264 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/config/appearance/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/appearance/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/config/appearance/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/kopete/config/appearance/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14680,16 +9289,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am  all-recursive
+@@ -452,7 +455,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -490,9 +493,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14699,95 +9308,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/kopete/config/accounts/Makefile.in kdenetwork-3.4.0/kopete/kopete/config/accounts/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/kopete/config/accounts/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/kopete/config/accounts/Makefile.in	2005-03-05 23:23:47.058471984 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_accountconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kopete_accountconfig_la_SOURCES)
-@@ -241,6 +241,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/config/behavior/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/behavior/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/config/behavior/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/kopete/config/behavior/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -239,6 +239,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14797,7 +9323,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,7 +448,7 @@
+@@ -450,7 +453,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14806,7 +9332,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -483,9 +486,9 @@
+@@ -488,9 +491,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14818,45 +9344,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/kopete/config/appearance/Makefile.in kdenetwork-3.4.0/kopete/kopete/config/appearance/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/kopete/config/appearance/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/kopete/config/appearance/Makefile.in	2005-03-05 23:23:47.081468488 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_appearanceconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kopete_appearanceconfig_la_SOURCES)
-@@ -241,6 +241,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/config/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/config/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kopete/kopete/config/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14866,16 +9357,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -434,9 +437,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14885,47 +9376,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/kopete/config/behavior/Makefile.in kdenetwork-3.4.0/kopete/kopete/config/behavior/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/kopete/config/behavior/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/kopete/config/behavior/Makefile.in	2005-03-05 23:23:47.095466360 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_behaviorconfig_la_SOURCES)
- DIST_SOURCES = $(kcm_kopete_behaviorconfig_la_SOURCES)
-@@ -239,6 +239,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/config/plugins/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/plugins/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/config/plugins/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/kopete/config/plugins/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14935,7 +9391,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -420,7 +423,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14944,7 +9400,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -458,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14954,47 +9410,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/kopete/config/plugins/Makefile.in kdenetwork-3.4.0/kopete/kopete/config/plugins/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/kopete/config/plugins/Makefile.in	2005-03-04 12:37:15.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/kopete/config/plugins/Makefile.in	2005-03-05 23:23:47.106464688 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,18 +66,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopetepluginconfig_la_SOURCES)
- DIST_SOURCES = $(libkopetepluginconfig_la_SOURCES)
-@@ -222,6 +222,9 @@
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/contactlist/Makefile.in kdenetwork-3.4.1/kopete/kopete/contactlist/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/contactlist/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/kopete/contactlist/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -239,6 +239,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15004,7 +9425,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
+@@ -461,7 +464,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15013,7 +9434,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -499,9 +502,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15025,45 +9446,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/kopete/contactlist/Makefile.in kdenetwork-3.4.0/kopete/kopete/contactlist/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/kopete/contactlist/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/kopete/contactlist/Makefile.in	2005-03-05 23:23:47.215448120 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopetecontactlist_la_SOURCES)
- DIST_SOURCES = $(libkopetecontactlist_la_SOURCES)
-@@ -239,6 +239,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/kconf_update/Makefile.in kdenetwork-3.4.1/kopete/kopete/kconf_update/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/kconf_update/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/kopete/kconf_update/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -261,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15073,7 +9459,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,7 @@
+@@ -473,7 +476,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15082,7 +9468,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -499,9 +502,9 @@
+@@ -511,9 +514,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15092,47 +9478,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/kopete/kconf_update/Makefile.in kdenetwork-3.4.0/kopete/kopete/kconf_update/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/kopete/kconf_update/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/kopete/kconf_update/Makefile.in	2005-03-05 23:23:47.227446296 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -93,18 +93,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_account_kconf_update_SOURCES) \
- 	$(kopete_nameTracking_kconf_update_SOURCES) \
-@@ -261,6 +261,9 @@
+ install-kconfPROGRAMS: $(kconf_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/Makefile.in kdenetwork-3.4.1/kopete/kopete/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kopete/kopete/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -264,6 +264,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15142,7 +9493,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -506,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15151,7 +9502,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -544,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15161,56 +9512,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kconfPROGRAMS: $(kconf_PROGRAMS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/libkopete/Makefile.in kdenetwork-3.4.0/kopete/libkopete/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/libkopete/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/libkopete/Makefile.in	2005-03-05 23:23:47.344428512 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -121,26 +121,26 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopete_la_SOURCES)
- DIST_SOURCES = $(libkopete_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/libkopete/Makefile.in kdenetwork-3.4.1/kopete/libkopete/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/libkopete/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/libkopete/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -304,6 +304,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15221,7 +9527,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -556,7 +559,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15230,7 +9536,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15242,92 +9548,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -771,7 +774,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -783,7 +792,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -791,7 +800,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -812,7 +827,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/libkopete/private/Makefile.in kdenetwork-3.4.0/kopete/libkopete/private/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/libkopete/private/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/libkopete/private/Makefile.in	2005-03-05 23:23:47.363425624 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -70,18 +70,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopeteprivate_la_SOURCES)
- DIST_SOURCES = $(libkopeteprivate_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/libkopete/private/Makefile.in kdenetwork-3.4.1/kopete/libkopete/private/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/libkopete/private/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/libkopete/private/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15359,44 +9582,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/libkopete/tests/Makefile.in kdenetwork-3.4.0/kopete/libkopete/tests/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/libkopete/tests/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/libkopete/tests/Makefile.in	2005-03-05 23:23:47.378423344 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopeteemoticontest_SOURCES) $(kopetelinktest_SOURCES) \
- 	$(kopetepasswordtest_SOURCES) $(kopetepropertiestest_SOURCES) \
+diff -Nrua kdenetwork-3.4.1.orig/kopete/libkopete/tests/Makefile.in kdenetwork-3.4.1/kopete/libkopete/tests/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/libkopete/tests/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/libkopete/tests/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -245,6 +245,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15428,44 +9616,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/libkopete/ui/Makefile.in kdenetwork-3.4.0/kopete/libkopete/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/libkopete/ui/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/libkopete/ui/Makefile.in	2005-03-05 23:23:47.396420608 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopeteui_la_SOURCES)
- DIST_SOURCES = $(libkopeteui_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/libkopete/ui/Makefile.in kdenetwork-3.4.1/kopete/libkopete/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/libkopete/ui/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/libkopete/ui/Makefile.in	2005-05-24 17:07:06.000000000 +0200
 @@ -243,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15497,22 +9650,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/Makefile.in kdenetwork-3.4.0/kopete/plugins/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/Makefile.in	2005-03-05 23:23:47.403419544 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -207,6 +207,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/Makefile.in kdenetwork-3.4.1/kopete/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/kopete/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -205,6 +205,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15522,7 +9663,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,7 +408,7 @@
+@@ -397,7 +400,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -15531,7 +9672,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -443,9 +446,9 @@
+@@ -435,9 +438,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15543,92 +9684,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -465,7 +468,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -477,7 +486,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -485,7 +494,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -506,7 +521,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/addbookmarks/Makefile.in kdenetwork-3.4.0/kopete/plugins/addbookmarks/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/addbookmarks/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/addbookmarks/Makefile.in	2005-03-05 23:23:47.419417112 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,18 +94,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_addbookmarks_la_SOURCES) \
- 	$(kopete_addbookmarks_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/addbookmarks/Makefile.in kdenetwork-3.4.1/kopete/plugins/addbookmarks/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/addbookmarks/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/addbookmarks/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -256,6 +256,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15660,44 +9718,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/alias/Makefile.in kdenetwork-3.4.0/kopete/plugins/alias/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/alias/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/alias/Makefile.in	2005-03-05 23:23:47.437414376 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,18 +86,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_alias_la_SOURCES) $(kopete_alias_la_SOURCES)
- DIST_SOURCES = $(kcm_kopete_alias_la_SOURCES) \
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/alias/Makefile.in kdenetwork-3.4.1/kopete/plugins/alias/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/alias/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/alias/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -246,6 +246,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15729,138 +9752,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/autoreplace/Makefile.in kdenetwork-3.4.0/kopete/plugins/autoreplace/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/autoreplace/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/autoreplace/Makefile.in	2005-03-05 23:23:47.454411792 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -92,18 +92,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_autoreplace_la_SOURCES) \
- 	$(kopete_autoreplace_la_SOURCES)
-@@ -267,6 +267,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -641,7 +644,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -653,7 +662,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -661,7 +670,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -682,7 +697,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/autoreplace/icons/Makefile.in kdenetwork-3.4.0/kopete/plugins/autoreplace/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/autoreplace/icons/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/autoreplace/icons/Makefile.in	2005-03-05 23:23:47.461410728 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/autoreplace/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/icons/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/autoreplace/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15892,45 +9786,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/connectionstatus/Makefile.in kdenetwork-3.4.0/kopete/plugins/connectionstatus/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/connectionstatus/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/connectionstatus/Makefile.in	2005-03-05 23:23:47.473408904 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_connectionstatus_la_SOURCES)
- DIST_SOURCES = $(kopete_connectionstatus_la_SOURCES)
-@@ -234,6 +234,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/Makefile.in kdenetwork-3.4.1/kopete/plugins/autoreplace/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/autoreplace/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -267,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15940,7 +9799,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -434,7 +437,7 @@
+@@ -479,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15949,7 +9808,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -472,9 +475,9 @@
+@@ -517,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15961,45 +9820,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/contactnotes/Makefile.in kdenetwork-3.4.0/kopete/plugins/contactnotes/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/contactnotes/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/contactnotes/Makefile.in	2005-03-05 23:23:47.485407080 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_contactnotes_la_SOURCES)
- DIST_SOURCES = $(kopete_contactnotes_la_SOURCES)
-@@ -238,6 +238,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/connectionstatus/Makefile.in kdenetwork-3.4.1/kopete/plugins/connectionstatus/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/connectionstatus/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/connectionstatus/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -234,6 +234,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16009,7 +9833,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,7 +445,7 @@
+@@ -434,7 +437,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16018,7 +9842,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -480,9 +483,9 @@
+@@ -472,9 +475,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16030,45 +9854,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/cryptography/Makefile.in kdenetwork-3.4.0/kopete/plugins/cryptography/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/cryptography/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/cryptography/Makefile.in	2005-03-05 23:23:47.510403280 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -94,18 +94,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_cryptography_la_SOURCES) \
- 	$(kopete_cryptography_la_SOURCES)
-@@ -270,6 +270,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/contactnotes/Makefile.in kdenetwork-3.4.1/kopete/plugins/contactnotes/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/contactnotes/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/contactnotes/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16078,7 +9867,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -442,7 +445,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16087,7 +9876,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -524,9 +527,9 @@
+@@ -480,9 +483,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16099,69 +9888,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -669,7 +672,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -681,7 +690,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -689,7 +698,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -710,7 +725,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/cryptography/icons/Makefile.in kdenetwork-3.4.0/kopete/plugins/cryptography/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/cryptography/icons/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/cryptography/icons/Makefile.in	2005-03-05 23:23:47.517402216 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/cryptography/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/cryptography/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/cryptography/icons/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/cryptography/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16193,45 +9922,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/highlight/Makefile.in kdenetwork-3.4.0/kopete/plugins/highlight/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/highlight/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/highlight/Makefile.in	2005-03-05 23:23:47.534399632 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -92,18 +92,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_highlight_la_SOURCES) \
- 	$(kopete_highlight_la_SOURCES)
-@@ -267,6 +267,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/cryptography/Makefile.in kdenetwork-3.4.1/kopete/plugins/cryptography/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/cryptography/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/cryptography/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -270,6 +270,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16241,7 +9935,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -486,7 +489,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16250,7 +9944,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -524,9 +527,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16262,69 +9956,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -642,7 +645,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -654,7 +663,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -662,7 +671,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -683,7 +698,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/highlight/icons/Makefile.in kdenetwork-3.4.0/kopete/plugins/highlight/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/highlight/icons/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/highlight/icons/Makefile.in	2005-03-05 23:23:47.542398416 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/highlight/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/highlight/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/highlight/icons/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/highlight/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16356,45 +9990,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/history/Makefile.in kdenetwork-3.4.0/kopete/plugins/history/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/history/Makefile.in	2005-03-04 12:37:16.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/history/Makefile.in	2005-03-05 23:23:47.567394616 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,18 +90,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_history_la_SOURCES) \
- 	$(kopete_history_la_SOURCES)
-@@ -253,6 +253,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/highlight/Makefile.in kdenetwork-3.4.1/kopete/plugins/highlight/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/highlight/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/highlight/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -267,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16404,7 +10003,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -479,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16413,7 +10012,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -517,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16425,45 +10024,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/latex/Makefile.in kdenetwork-3.4.0/kopete/plugins/latex/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/latex/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/latex/Makefile.in	2005-03-05 23:23:47.585391880 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -91,18 +91,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_latex_la_SOURCES) $(kopete_latex_la_SOURCES)
- DIST_SOURCES = $(kcm_kopete_latex_la_SOURCES) \
-@@ -266,6 +266,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/history/Makefile.in kdenetwork-3.4.1/kopete/plugins/history/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/history/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/history/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -253,6 +253,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16473,7 +10037,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -482,7 +485,7 @@
+@@ -472,7 +475,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16482,7 +10046,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -520,9 +523,9 @@
+@@ -510,9 +513,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16494,69 +10058,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -679,7 +682,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -691,7 +700,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -699,7 +708,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -720,7 +735,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/latex/icons/Makefile.in kdenetwork-3.4.0/kopete/plugins/latex/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/latex/icons/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/latex/icons/Makefile.in	2005-03-05 23:23:47.592390816 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/latex/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/latex/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/latex/icons/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/latex/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16588,45 +10092,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/motionautoaway/Makefile.in kdenetwork-3.4.0/kopete/plugins/motionautoaway/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/motionautoaway/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/motionautoaway/Makefile.in	2005-03-05 23:23:47.608388384 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -88,18 +88,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_motionaway_la_SOURCES) \
- 	$(kopete_motionaway_la_SOURCES)
-@@ -250,6 +250,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/latex/Makefile.in kdenetwork-3.4.1/kopete/plugins/latex/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/latex/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/latex/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -266,6 +266,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16636,7 +10105,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -482,7 +485,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16645,7 +10114,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -520,9 +523,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16657,45 +10126,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/netmeeting/Makefile.in kdenetwork-3.4.0/kopete/plugins/netmeeting/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/netmeeting/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/netmeeting/Makefile.in	2005-03-05 23:23:47.624385952 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -92,18 +92,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_netmeeting_la_SOURCES) \
- 	$(kopete_netmeeting_la_SOURCES)
-@@ -254,6 +254,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/Makefile.in kdenetwork-3.4.1/kopete/plugins/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -207,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16705,16 +10139,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -405,7 +408,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -443,9 +446,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16724,47 +10158,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/nowlistening/Makefile.in kdenetwork-3.4.0/kopete/plugins/nowlistening/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/nowlistening/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/nowlistening/Makefile.in	2005-03-05 23:23:47.643383064 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -97,18 +97,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_nowlistening_la_SOURCES) \
- 	$(kopete_nowlistening_la_SOURCES)
-@@ -260,6 +260,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/motionautoaway/Makefile.in kdenetwork-3.4.1/kopete/plugins/motionautoaway/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/motionautoaway/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/motionautoaway/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -250,6 +250,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16774,7 +10173,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -462,7 +465,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16783,7 +10182,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -500,9 +503,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16795,45 +10194,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/smpppdcs/Makefile.in kdenetwork-3.4.0/kopete/plugins/smpppdcs/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/smpppdcs/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/smpppdcs/Makefile.in	2005-03-05 23:23:47.659380632 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_smpppdcs_la_SOURCES)
- DIST_SOURCES = $(kopete_smpppdcs_la_SOURCES)
-@@ -246,6 +246,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/netmeeting/Makefile.in kdenetwork-3.4.1/kopete/plugins/netmeeting/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/netmeeting/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/netmeeting/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -254,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16843,7 +10207,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -467,7 +470,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16852,7 +10216,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -505,9 +508,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16864,93 +10228,20 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -587,7 +590,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -599,7 +608,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -607,7 +616,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -628,7 +643,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/smpppdcs/config/Makefile.in kdenetwork-3.4.0/kopete/plugins/smpppdcs/config/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/smpppdcs/config/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/smpppdcs/config/Makefile.in	2005-03-05 23:23:47.673378504 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_smpppdcs_la_SOURCES)
- DIST_SOURCES = $(kcm_kopete_smpppdcs_la_SOURCES)
-@@ -241,6 +241,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/nowlistening/Makefile.in kdenetwork-3.4.1/kopete/plugins/nowlistening/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/nowlistening/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/nowlistening/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -76,8 +76,7 @@
+ 	nowlisteningconfig.lo nowlisteningprefs.lo
+ @KDE_USE_FINAL_FALSE@kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_nofinal_OBJECTS)
+ @KDE_USE_FINAL_TRUE@kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_final_OBJECTS)
+-kopete_nowlistening_la_DEPENDENCIES = ../../libkopete/libkopete.la \
+-	$(am__DEPENDENCIES_1)
++kopete_nowlistening_la_DEPENDENCIES = ../../libkopete/libkopete.la
+ am_kopete_nowlistening_la_OBJECTS = nowlisteningconfig.lo \
+ 	nowlisteningplugin.lo nlkscd.lo nlnoatun.lo nlxmms.lo \
+ 	nowlisteningguiclient.lo nljuk.lo nlamarok.lo nlkaffeine.lo
+@@ -260,6 +259,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16960,7 +10251,18 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -450,8 +452,8 @@
+ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(XMMS_INCLUDES) $(all_includes)
+ kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
+ kopete_nowlistening_la_SOURCES = nowlisteningconfig.cpp nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
+-kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN) $(XMMS_LDFLAGS)
+-kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la $(XMMS_LIBS)
++kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN)
++kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la
+ #>- kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.cpp
+ #>+ 1
+ kcm_kopete_nowlistening_la_SOURCES= nowlisteningpreferences.cpp nowlisteningconfig.cpp nowlisteningprefs.cpp
+@@ -472,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16969,7 +10271,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -510,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16981,22 +10283,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/smpppdcs/icons/Makefile.in kdenetwork-3.4.0/kopete/plugins/smpppdcs/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/smpppdcs/icons/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/smpppdcs/icons/Makefile.in	2005-03-05 23:23:47.680377440 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -188,6 +188,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/config/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/config/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/config/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/config/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17006,16 +10296,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
- all: docs-am  all-am
+@@ -449,7 +452,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -487,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17025,47 +10315,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/statistics/Makefile.in kdenetwork-3.4.0/kopete/plugins/statistics/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/statistics/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/statistics/Makefile.in	2005-03-05 23:23:47.702374096 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_statistics_la_SOURCES)
- DIST_SOURCES = $(kopete_statistics_la_SOURCES)
-@@ -255,6 +255,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/icons/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17075,16 +10330,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -381,7 +384,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -419,9 +422,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17094,86 +10349,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -639,7 +642,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -651,7 +660,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -659,7 +668,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -680,7 +695,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/statistics/sqlite/Makefile.in kdenetwork-3.4.0/kopete/plugins/statistics/sqlite/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/statistics/sqlite/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/statistics/sqlite/Makefile.in	2005-03-05 23:23:47.719371512 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -98,11 +98,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libsqlite_la_SOURCES)
- DIST_SOURCES = $(libsqlite_la_SOURCES)
-@@ -247,6 +247,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -246,6 +246,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17183,16 +10364,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -449,7 +452,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -487,9 +490,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17202,376 +10383,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-@@ -609,256 +612,256 @@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- libsqlite_la-attach.lo: attach.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-attach.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-attach.Tpo" -c -o libsqlite_la-attach.lo `test -f 'attach.c' || echo '$(srcdir)/'`attach.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-attach.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-attach.Tpo" -c -o libsqlite_la-attach.lo `test -f 'attach.c' || echo '$(srcdir)/'`attach.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-attach.Tpo" "$(DEPDIR)/libsqlite_la-attach.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-attach.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='attach.c' object='libsqlite_la-attach.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-attach.lo `test -f 'attach.c' || echo '$(srcdir)/'`attach.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-attach.lo `test -f 'attach.c' || echo '$(srcdir)/'`attach.c
- 
- libsqlite_la-auth.lo: auth.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-auth.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-auth.Tpo" -c -o libsqlite_la-auth.lo `test -f 'auth.c' || echo '$(srcdir)/'`auth.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-auth.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-auth.Tpo" -c -o libsqlite_la-auth.lo `test -f 'auth.c' || echo '$(srcdir)/'`auth.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-auth.Tpo" "$(DEPDIR)/libsqlite_la-auth.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-auth.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth.c' object='libsqlite_la-auth.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-auth.lo `test -f 'auth.c' || echo '$(srcdir)/'`auth.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-auth.lo `test -f 'auth.c' || echo '$(srcdir)/'`auth.c
- 
- libsqlite_la-btree.lo: btree.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-btree.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-btree.Tpo" -c -o libsqlite_la-btree.lo `test -f 'btree.c' || echo '$(srcdir)/'`btree.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-btree.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-btree.Tpo" -c -o libsqlite_la-btree.lo `test -f 'btree.c' || echo '$(srcdir)/'`btree.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-btree.Tpo" "$(DEPDIR)/libsqlite_la-btree.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-btree.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='btree.c' object='libsqlite_la-btree.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-btree.lo `test -f 'btree.c' || echo '$(srcdir)/'`btree.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-btree.lo `test -f 'btree.c' || echo '$(srcdir)/'`btree.c
- 
- libsqlite_la-build.lo: build.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-build.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-build.Tpo" -c -o libsqlite_la-build.lo `test -f 'build.c' || echo '$(srcdir)/'`build.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-build.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-build.Tpo" -c -o libsqlite_la-build.lo `test -f 'build.c' || echo '$(srcdir)/'`build.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-build.Tpo" "$(DEPDIR)/libsqlite_la-build.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-build.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='build.c' object='libsqlite_la-build.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-build.lo `test -f 'build.c' || echo '$(srcdir)/'`build.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-build.lo `test -f 'build.c' || echo '$(srcdir)/'`build.c
- 
- libsqlite_la-date.lo: date.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-date.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-date.Tpo" -c -o libsqlite_la-date.lo `test -f 'date.c' || echo '$(srcdir)/'`date.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-date.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-date.Tpo" -c -o libsqlite_la-date.lo `test -f 'date.c' || echo '$(srcdir)/'`date.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-date.Tpo" "$(DEPDIR)/libsqlite_la-date.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-date.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='date.c' object='libsqlite_la-date.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-date.lo `test -f 'date.c' || echo '$(srcdir)/'`date.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-date.lo `test -f 'date.c' || echo '$(srcdir)/'`date.c
- 
- libsqlite_la-delete.lo: delete.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-delete.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-delete.Tpo" -c -o libsqlite_la-delete.lo `test -f 'delete.c' || echo '$(srcdir)/'`delete.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-delete.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-delete.Tpo" -c -o libsqlite_la-delete.lo `test -f 'delete.c' || echo '$(srcdir)/'`delete.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-delete.Tpo" "$(DEPDIR)/libsqlite_la-delete.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-delete.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='delete.c' object='libsqlite_la-delete.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-delete.lo `test -f 'delete.c' || echo '$(srcdir)/'`delete.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-delete.lo `test -f 'delete.c' || echo '$(srcdir)/'`delete.c
- 
- libsqlite_la-encode.lo: encode.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-encode.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-encode.Tpo" -c -o libsqlite_la-encode.lo `test -f 'encode.c' || echo '$(srcdir)/'`encode.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-encode.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-encode.Tpo" -c -o libsqlite_la-encode.lo `test -f 'encode.c' || echo '$(srcdir)/'`encode.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-encode.Tpo" "$(DEPDIR)/libsqlite_la-encode.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-encode.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='encode.c' object='libsqlite_la-encode.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-encode.lo `test -f 'encode.c' || echo '$(srcdir)/'`encode.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-encode.lo `test -f 'encode.c' || echo '$(srcdir)/'`encode.c
- 
- libsqlite_la-expr.lo: expr.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-expr.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-expr.Tpo" -c -o libsqlite_la-expr.lo `test -f 'expr.c' || echo '$(srcdir)/'`expr.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-expr.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-expr.Tpo" -c -o libsqlite_la-expr.lo `test -f 'expr.c' || echo '$(srcdir)/'`expr.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-expr.Tpo" "$(DEPDIR)/libsqlite_la-expr.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-expr.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='expr.c' object='libsqlite_la-expr.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-expr.lo `test -f 'expr.c' || echo '$(srcdir)/'`expr.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-expr.lo `test -f 'expr.c' || echo '$(srcdir)/'`expr.c
- 
- libsqlite_la-func.lo: func.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-func.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-func.Tpo" -c -o libsqlite_la-func.lo `test -f 'func.c' || echo '$(srcdir)/'`func.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-func.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-func.Tpo" -c -o libsqlite_la-func.lo `test -f 'func.c' || echo '$(srcdir)/'`func.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-func.Tpo" "$(DEPDIR)/libsqlite_la-func.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-func.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='func.c' object='libsqlite_la-func.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-func.lo `test -f 'func.c' || echo '$(srcdir)/'`func.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-func.lo `test -f 'func.c' || echo '$(srcdir)/'`func.c
- 
- libsqlite_la-hash.lo: hash.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-hash.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-hash.Tpo" -c -o libsqlite_la-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-hash.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-hash.Tpo" -c -o libsqlite_la-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-hash.Tpo" "$(DEPDIR)/libsqlite_la-hash.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-hash.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hash.c' object='libsqlite_la-hash.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c
- 
- libsqlite_la-insert.lo: insert.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-insert.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-insert.Tpo" -c -o libsqlite_la-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-insert.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-insert.Tpo" -c -o libsqlite_la-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-insert.Tpo" "$(DEPDIR)/libsqlite_la-insert.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-insert.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='insert.c' object='libsqlite_la-insert.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-insert.lo `test -f 'insert.c' || echo '$(srcdir)/'`insert.c
- 
- libsqlite_la-legacy.lo: legacy.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-legacy.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-legacy.Tpo" -c -o libsqlite_la-legacy.lo `test -f 'legacy.c' || echo '$(srcdir)/'`legacy.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-legacy.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-legacy.Tpo" -c -o libsqlite_la-legacy.lo `test -f 'legacy.c' || echo '$(srcdir)/'`legacy.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-legacy.Tpo" "$(DEPDIR)/libsqlite_la-legacy.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-legacy.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='legacy.c' object='libsqlite_la-legacy.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-legacy.lo `test -f 'legacy.c' || echo '$(srcdir)/'`legacy.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-legacy.lo `test -f 'legacy.c' || echo '$(srcdir)/'`legacy.c
- 
- libsqlite_la-main.lo: main.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-main.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-main.Tpo" -c -o libsqlite_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-main.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-main.Tpo" -c -o libsqlite_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-main.Tpo" "$(DEPDIR)/libsqlite_la-main.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-main.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='libsqlite_la-main.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c
- 
- libsqlite_la-opcodes.lo: opcodes.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-opcodes.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-opcodes.Tpo" -c -o libsqlite_la-opcodes.lo `test -f 'opcodes.c' || echo '$(srcdir)/'`opcodes.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-opcodes.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-opcodes.Tpo" -c -o libsqlite_la-opcodes.lo `test -f 'opcodes.c' || echo '$(srcdir)/'`opcodes.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-opcodes.Tpo" "$(DEPDIR)/libsqlite_la-opcodes.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-opcodes.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='opcodes.c' object='libsqlite_la-opcodes.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-opcodes.lo `test -f 'opcodes.c' || echo '$(srcdir)/'`opcodes.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-opcodes.lo `test -f 'opcodes.c' || echo '$(srcdir)/'`opcodes.c
- 
- libsqlite_la-os_mac.lo: os_mac.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-os_mac.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-os_mac.Tpo" -c -o libsqlite_la-os_mac.lo `test -f 'os_mac.c' || echo '$(srcdir)/'`os_mac.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-os_mac.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-os_mac.Tpo" -c -o libsqlite_la-os_mac.lo `test -f 'os_mac.c' || echo '$(srcdir)/'`os_mac.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-os_mac.Tpo" "$(DEPDIR)/libsqlite_la-os_mac.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-os_mac.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os_mac.c' object='libsqlite_la-os_mac.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-os_mac.lo `test -f 'os_mac.c' || echo '$(srcdir)/'`os_mac.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-os_mac.lo `test -f 'os_mac.c' || echo '$(srcdir)/'`os_mac.c
- 
- libsqlite_la-os_unix.lo: os_unix.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-os_unix.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-os_unix.Tpo" -c -o libsqlite_la-os_unix.lo `test -f 'os_unix.c' || echo '$(srcdir)/'`os_unix.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-os_unix.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-os_unix.Tpo" -c -o libsqlite_la-os_unix.lo `test -f 'os_unix.c' || echo '$(srcdir)/'`os_unix.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-os_unix.Tpo" "$(DEPDIR)/libsqlite_la-os_unix.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-os_unix.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os_unix.c' object='libsqlite_la-os_unix.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-os_unix.lo `test -f 'os_unix.c' || echo '$(srcdir)/'`os_unix.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-os_unix.lo `test -f 'os_unix.c' || echo '$(srcdir)/'`os_unix.c
- 
- libsqlite_la-os_win.lo: os_win.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-os_win.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-os_win.Tpo" -c -o libsqlite_la-os_win.lo `test -f 'os_win.c' || echo '$(srcdir)/'`os_win.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-os_win.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-os_win.Tpo" -c -o libsqlite_la-os_win.lo `test -f 'os_win.c' || echo '$(srcdir)/'`os_win.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-os_win.Tpo" "$(DEPDIR)/libsqlite_la-os_win.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-os_win.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='os_win.c' object='libsqlite_la-os_win.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-os_win.lo `test -f 'os_win.c' || echo '$(srcdir)/'`os_win.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-os_win.lo `test -f 'os_win.c' || echo '$(srcdir)/'`os_win.c
- 
- libsqlite_la-pager.lo: pager.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-pager.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-pager.Tpo" -c -o libsqlite_la-pager.lo `test -f 'pager.c' || echo '$(srcdir)/'`pager.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-pager.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-pager.Tpo" -c -o libsqlite_la-pager.lo `test -f 'pager.c' || echo '$(srcdir)/'`pager.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-pager.Tpo" "$(DEPDIR)/libsqlite_la-pager.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-pager.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pager.c' object='libsqlite_la-pager.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-pager.lo `test -f 'pager.c' || echo '$(srcdir)/'`pager.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-pager.lo `test -f 'pager.c' || echo '$(srcdir)/'`pager.c
- 
- libsqlite_la-parse.lo: parse.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-parse.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-parse.Tpo" -c -o libsqlite_la-parse.lo `test -f 'parse.c' || echo '$(srcdir)/'`parse.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-parse.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-parse.Tpo" -c -o libsqlite_la-parse.lo `test -f 'parse.c' || echo '$(srcdir)/'`parse.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-parse.Tpo" "$(DEPDIR)/libsqlite_la-parse.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-parse.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parse.c' object='libsqlite_la-parse.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-parse.lo `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-parse.lo `test -f 'parse.c' || echo '$(srcdir)/'`parse.c
- 
- libsqlite_la-pragma.lo: pragma.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-pragma.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-pragma.Tpo" -c -o libsqlite_la-pragma.lo `test -f 'pragma.c' || echo '$(srcdir)/'`pragma.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-pragma.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-pragma.Tpo" -c -o libsqlite_la-pragma.lo `test -f 'pragma.c' || echo '$(srcdir)/'`pragma.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-pragma.Tpo" "$(DEPDIR)/libsqlite_la-pragma.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-pragma.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pragma.c' object='libsqlite_la-pragma.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-pragma.lo `test -f 'pragma.c' || echo '$(srcdir)/'`pragma.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-pragma.lo `test -f 'pragma.c' || echo '$(srcdir)/'`pragma.c
- 
- libsqlite_la-printf.lo: printf.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-printf.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-printf.Tpo" -c -o libsqlite_la-printf.lo `test -f 'printf.c' || echo '$(srcdir)/'`printf.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-printf.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-printf.Tpo" -c -o libsqlite_la-printf.lo `test -f 'printf.c' || echo '$(srcdir)/'`printf.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-printf.Tpo" "$(DEPDIR)/libsqlite_la-printf.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-printf.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printf.c' object='libsqlite_la-printf.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-printf.lo `test -f 'printf.c' || echo '$(srcdir)/'`printf.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-printf.lo `test -f 'printf.c' || echo '$(srcdir)/'`printf.c
- 
- libsqlite_la-random.lo: random.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-random.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-random.Tpo" -c -o libsqlite_la-random.lo `test -f 'random.c' || echo '$(srcdir)/'`random.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-random.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-random.Tpo" -c -o libsqlite_la-random.lo `test -f 'random.c' || echo '$(srcdir)/'`random.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-random.Tpo" "$(DEPDIR)/libsqlite_la-random.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-random.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='random.c' object='libsqlite_la-random.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-random.lo `test -f 'random.c' || echo '$(srcdir)/'`random.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-random.lo `test -f 'random.c' || echo '$(srcdir)/'`random.c
- 
- libsqlite_la-select.lo: select.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-select.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-select.Tpo" -c -o libsqlite_la-select.lo `test -f 'select.c' || echo '$(srcdir)/'`select.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-select.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-select.Tpo" -c -o libsqlite_la-select.lo `test -f 'select.c' || echo '$(srcdir)/'`select.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-select.Tpo" "$(DEPDIR)/libsqlite_la-select.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-select.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='select.c' object='libsqlite_la-select.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-select.lo `test -f 'select.c' || echo '$(srcdir)/'`select.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-select.lo `test -f 'select.c' || echo '$(srcdir)/'`select.c
- 
- libsqlite_la-shell.lo: shell.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-shell.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-shell.Tpo" -c -o libsqlite_la-shell.lo `test -f 'shell.c' || echo '$(srcdir)/'`shell.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-shell.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-shell.Tpo" -c -o libsqlite_la-shell.lo `test -f 'shell.c' || echo '$(srcdir)/'`shell.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-shell.Tpo" "$(DEPDIR)/libsqlite_la-shell.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-shell.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='shell.c' object='libsqlite_la-shell.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-shell.lo `test -f 'shell.c' || echo '$(srcdir)/'`shell.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-shell.lo `test -f 'shell.c' || echo '$(srcdir)/'`shell.c
- 
- libsqlite_la-table.lo: table.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-table.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-table.Tpo" -c -o libsqlite_la-table.lo `test -f 'table.c' || echo '$(srcdir)/'`table.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-table.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-table.Tpo" -c -o libsqlite_la-table.lo `test -f 'table.c' || echo '$(srcdir)/'`table.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-table.Tpo" "$(DEPDIR)/libsqlite_la-table.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-table.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='table.c' object='libsqlite_la-table.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-table.lo `test -f 'table.c' || echo '$(srcdir)/'`table.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-table.lo `test -f 'table.c' || echo '$(srcdir)/'`table.c
- 
- libsqlite_la-tokenize.lo: tokenize.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-tokenize.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-tokenize.Tpo" -c -o libsqlite_la-tokenize.lo `test -f 'tokenize.c' || echo '$(srcdir)/'`tokenize.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-tokenize.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-tokenize.Tpo" -c -o libsqlite_la-tokenize.lo `test -f 'tokenize.c' || echo '$(srcdir)/'`tokenize.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-tokenize.Tpo" "$(DEPDIR)/libsqlite_la-tokenize.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-tokenize.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tokenize.c' object='libsqlite_la-tokenize.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-tokenize.lo `test -f 'tokenize.c' || echo '$(srcdir)/'`tokenize.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-tokenize.lo `test -f 'tokenize.c' || echo '$(srcdir)/'`tokenize.c
- 
- libsqlite_la-trigger.lo: trigger.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-trigger.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-trigger.Tpo" -c -o libsqlite_la-trigger.lo `test -f 'trigger.c' || echo '$(srcdir)/'`trigger.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-trigger.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-trigger.Tpo" -c -o libsqlite_la-trigger.lo `test -f 'trigger.c' || echo '$(srcdir)/'`trigger.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-trigger.Tpo" "$(DEPDIR)/libsqlite_la-trigger.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-trigger.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='trigger.c' object='libsqlite_la-trigger.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-trigger.lo `test -f 'trigger.c' || echo '$(srcdir)/'`trigger.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-trigger.lo `test -f 'trigger.c' || echo '$(srcdir)/'`trigger.c
- 
- libsqlite_la-update.lo: update.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-update.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-update.Tpo" -c -o libsqlite_la-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-update.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-update.Tpo" -c -o libsqlite_la-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-update.Tpo" "$(DEPDIR)/libsqlite_la-update.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-update.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='update.c' object='libsqlite_la-update.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-update.lo `test -f 'update.c' || echo '$(srcdir)/'`update.c
- 
- libsqlite_la-utf.lo: utf.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-utf.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-utf.Tpo" -c -o libsqlite_la-utf.lo `test -f 'utf.c' || echo '$(srcdir)/'`utf.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-utf.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-utf.Tpo" -c -o libsqlite_la-utf.lo `test -f 'utf.c' || echo '$(srcdir)/'`utf.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-utf.Tpo" "$(DEPDIR)/libsqlite_la-utf.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-utf.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='utf.c' object='libsqlite_la-utf.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-utf.lo `test -f 'utf.c' || echo '$(srcdir)/'`utf.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-utf.lo `test -f 'utf.c' || echo '$(srcdir)/'`utf.c
- 
- libsqlite_la-util.lo: util.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-util.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-util.Tpo" -c -o libsqlite_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-util.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-util.Tpo" -c -o libsqlite_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-util.Tpo" "$(DEPDIR)/libsqlite_la-util.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-util.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='util.c' object='libsqlite_la-util.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-util.lo `test -f 'util.c' || echo '$(srcdir)/'`util.c
- 
- libsqlite_la-vacuum.lo: vacuum.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-vacuum.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-vacuum.Tpo" -c -o libsqlite_la-vacuum.lo `test -f 'vacuum.c' || echo '$(srcdir)/'`vacuum.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-vacuum.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-vacuum.Tpo" -c -o libsqlite_la-vacuum.lo `test -f 'vacuum.c' || echo '$(srcdir)/'`vacuum.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-vacuum.Tpo" "$(DEPDIR)/libsqlite_la-vacuum.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-vacuum.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='vacuum.c' object='libsqlite_la-vacuum.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-vacuum.lo `test -f 'vacuum.c' || echo '$(srcdir)/'`vacuum.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-vacuum.lo `test -f 'vacuum.c' || echo '$(srcdir)/'`vacuum.c
- 
- libsqlite_la-vdbe.lo: vdbe.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-vdbe.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-vdbe.Tpo" -c -o libsqlite_la-vdbe.lo `test -f 'vdbe.c' || echo '$(srcdir)/'`vdbe.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-vdbe.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-vdbe.Tpo" -c -o libsqlite_la-vdbe.lo `test -f 'vdbe.c' || echo '$(srcdir)/'`vdbe.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-vdbe.Tpo" "$(DEPDIR)/libsqlite_la-vdbe.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-vdbe.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='vdbe.c' object='libsqlite_la-vdbe.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-vdbe.lo `test -f 'vdbe.c' || echo '$(srcdir)/'`vdbe.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-vdbe.lo `test -f 'vdbe.c' || echo '$(srcdir)/'`vdbe.c
- 
- libsqlite_la-vdbeapi.lo: vdbeapi.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-vdbeapi.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-vdbeapi.Tpo" -c -o libsqlite_la-vdbeapi.lo `test -f 'vdbeapi.c' || echo '$(srcdir)/'`vdbeapi.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-vdbeapi.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-vdbeapi.Tpo" -c -o libsqlite_la-vdbeapi.lo `test -f 'vdbeapi.c' || echo '$(srcdir)/'`vdbeapi.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-vdbeapi.Tpo" "$(DEPDIR)/libsqlite_la-vdbeapi.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-vdbeapi.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='vdbeapi.c' object='libsqlite_la-vdbeapi.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-vdbeapi.lo `test -f 'vdbeapi.c' || echo '$(srcdir)/'`vdbeapi.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-vdbeapi.lo `test -f 'vdbeapi.c' || echo '$(srcdir)/'`vdbeapi.c
- 
- libsqlite_la-vdbeaux.lo: vdbeaux.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-vdbeaux.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-vdbeaux.Tpo" -c -o libsqlite_la-vdbeaux.lo `test -f 'vdbeaux.c' || echo '$(srcdir)/'`vdbeaux.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-vdbeaux.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-vdbeaux.Tpo" -c -o libsqlite_la-vdbeaux.lo `test -f 'vdbeaux.c' || echo '$(srcdir)/'`vdbeaux.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-vdbeaux.Tpo" "$(DEPDIR)/libsqlite_la-vdbeaux.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-vdbeaux.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='vdbeaux.c' object='libsqlite_la-vdbeaux.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-vdbeaux.lo `test -f 'vdbeaux.c' || echo '$(srcdir)/'`vdbeaux.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-vdbeaux.lo `test -f 'vdbeaux.c' || echo '$(srcdir)/'`vdbeaux.c
- 
- libsqlite_la-vdbemem.lo: vdbemem.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-vdbemem.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-vdbemem.Tpo" -c -o libsqlite_la-vdbemem.lo `test -f 'vdbemem.c' || echo '$(srcdir)/'`vdbemem.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-vdbemem.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-vdbemem.Tpo" -c -o libsqlite_la-vdbemem.lo `test -f 'vdbemem.c' || echo '$(srcdir)/'`vdbemem.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-vdbemem.Tpo" "$(DEPDIR)/libsqlite_la-vdbemem.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-vdbemem.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='vdbemem.c' object='libsqlite_la-vdbemem.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-vdbemem.lo `test -f 'vdbemem.c' || echo '$(srcdir)/'`vdbemem.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-vdbemem.lo `test -f 'vdbemem.c' || echo '$(srcdir)/'`vdbemem.c
- 
- libsqlite_la-where.lo: where.c
--@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-where.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-where.Tpo" -c -o libsqlite_la-where.lo `test -f 'where.c' || echo '$(srcdir)/'`where.c; \
-+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -MT libsqlite_la-where.lo -MD -MP -MF "$(DEPDIR)/libsqlite_la-where.Tpo" -c -o libsqlite_la-where.lo `test -f 'where.c' || echo '$(srcdir)/'`where.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libsqlite_la-where.Tpo" "$(DEPDIR)/libsqlite_la-where.Plo"; else rm -f "$(DEPDIR)/libsqlite_la-where.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='where.c' object='libsqlite_la-where.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-where.lo `test -f 'where.c' || echo '$(srcdir)/'`where.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsqlite_la_CFLAGS) $(CFLAGS) -c -o libsqlite_la-where.lo `test -f 'where.c' || echo '$(srcdir)/'`where.c
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/texteffect/Makefile.in kdenetwork-3.4.0/kopete/plugins/texteffect/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/texteffect/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/texteffect/Makefile.in	2005-03-05 23:23:47.736368928 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -92,18 +92,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_texteffect_la_SOURCES) \
- 	$(kopete_texteffect_la_SOURCES)
-@@ -267,6 +267,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/statistics/Makefile.in kdenetwork-3.4.1/kopete/plugins/statistics/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/statistics/Makefile.in	2005-05-23 18:09:02.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/statistics/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -255,6 +255,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17581,7 +10398,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -464,7 +467,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17590,7 +10407,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -502,9 +505,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17602,70 +10419,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -641,7 +644,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -653,7 +662,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -661,7 +670,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -682,7 +697,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/texteffect/icons/Makefile.in kdenetwork-3.4.0/kopete/plugins/texteffect/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/texteffect/icons/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/texteffect/icons/Makefile.in	2005-03-05 23:23:47.744367712 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -188,6 +188,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/statistics/sqlite/Makefile.in kdenetwork-3.4.1/kopete/plugins/statistics/sqlite/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/statistics/sqlite/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/statistics/sqlite/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17675,16 +10432,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -381,7 +384,7 @@
- all: docs-am  all-am
+@@ -490,7 +493,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .c .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -419,9 +422,9 @@
+@@ -528,9 +531,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17695,46 +10452,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/translator/Makefile.in kdenetwork-3.4.0/kopete/plugins/translator/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/translator/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/translator/Makefile.in	2005-03-05 23:23:47.761365128 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -95,18 +95,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_translator_la_SOURCES) \
- 	$(kopete_translator_la_SOURCES)
-@@ -257,6 +257,9 @@
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/texteffect/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/texteffect/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/texteffect/icons/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/texteffect/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17744,16 +10466,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,7 @@
+@@ -381,7 +384,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +513,9 @@
+@@ -419,9 +422,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17763,47 +10485,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/plugins/webpresence/Makefile.in kdenetwork-3.4.0/kopete/plugins/webpresence/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/plugins/webpresence/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/plugins/webpresence/Makefile.in	2005-03-05 23:23:47.778362544 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,18 +86,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_webpresence_la_SOURCES) \
- 	$(kopete_webpresence_la_SOURCES)
-@@ -248,6 +248,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/texteffect/Makefile.in kdenetwork-3.4.1/kopete/plugins/texteffect/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/texteffect/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/texteffect/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -267,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17813,7 +10500,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -462,7 +465,7 @@
+@@ -479,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17822,7 +10509,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -500,9 +503,9 @@
+@@ -517,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17834,22 +10521,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/Makefile.in kdenetwork-3.4.0/kopete/protocols/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/Makefile.in	2005-03-05 23:23:47.786361328 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/translator/Makefile.in kdenetwork-3.4.1/kopete/plugins/translator/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/translator/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/translator/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -257,6 +257,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17859,16 +10534,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -399,7 +402,7 @@
- all: docs-am  all-recursive
+@@ -472,7 +475,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -437,9 +440,9 @@
+@@ -510,9 +513,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17878,95 +10553,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -459,7 +462,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -471,7 +480,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -479,7 +488,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -500,7 +515,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/gadu/Makefile.in kdenetwork-3.4.0/kopete/protocols/gadu/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/gadu/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/gadu/Makefile.in	2005-03-05 23:23:47.832354336 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -93,18 +93,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_gadu_la_SOURCES)
- DIST_SOURCES = $(kopete_gadu_la_SOURCES)
-@@ -265,6 +265,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/webpresence/Makefile.in kdenetwork-3.4.1/kopete/plugins/webpresence/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/webpresence/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/plugins/webpresence/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -248,6 +248,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17976,7 +10568,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -462,7 +465,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17985,7 +10577,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -500,9 +503,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17997,69 +10589,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -645,7 +648,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -657,7 +666,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -665,7 +674,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -686,7 +701,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/gadu/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/gadu/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/gadu/icons/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/gadu/icons/Makefile.in	2005-03-05 23:23:47.841352968 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/gadu/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/gadu/icons/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/gadu/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18091,35 +10623,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/gadu/libgadu/Makefile.in kdenetwork-3.4.0/kopete/protocols/gadu/libgadu/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/gadu/libgadu/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/gadu/libgadu/Makefile.in	2005-03-05 23:23:47.851351448 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,11 +68,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libgadu_copy_la_SOURCES)
- DIST_SOURCES = $(libgadu_copy_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/gadu/libgadu/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/libgadu/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/gadu/libgadu/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/gadu/libgadu/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -217,6 +217,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18151,45 +10657,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/gadu/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/gadu/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/gadu/ui/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/gadu/ui/Makefile.in	2005-03-05 23:23:47.862349776 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,18 +67,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libgaduui_la_SOURCES)
- DIST_SOURCES = $(libgaduui_la_SOURCES)
-@@ -223,6 +223,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/gadu/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/gadu/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/gadu/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -265,6 +265,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18199,7 +10670,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -430,7 +433,7 @@
+@@ -492,7 +495,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18208,7 +10679,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -468,9 +471,9 @@
+@@ -530,9 +533,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18218,47 +10689,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/groupwise/Makefile.in kdenetwork-3.4.0/kopete/protocols/groupwise/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/groupwise/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/groupwise/Makefile.in	2005-03-05 23:23:47.917341416 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,18 +86,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_groupwise_la_SOURCES)
- DIST_SOURCES = $(kopete_groupwise_la_SOURCES)
-@@ -260,6 +260,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/gadu/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/gadu/ui/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/gadu/ui/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18268,7 +10704,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -430,7 +433,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18277,7 +10713,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -517,9 +520,9 @@
+@@ -468,9 +471,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18287,71 +10723,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -639,7 +642,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -651,7 +660,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -659,7 +668,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -680,7 +695,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/groupwise/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/groupwise/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/groupwise/icons/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/groupwise/icons/Makefile.in	2005-03-05 23:23:47.926340048 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/icons/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18383,44 +10759,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/Makefile.in	2005-03-05 23:23:47.983331384 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -93,18 +93,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libgroupwise_la_SOURCES) $(libgwtest_la_SOURCES)
- DIST_SOURCES = $(libgroupwise_la_SOURCES) $(libgwtest_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -264,6 +264,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18452,69 +10793,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -651,7 +654,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -663,7 +672,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -671,7 +680,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -692,7 +707,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in	2005-03-05 23:23:47.991330168 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -205,6 +205,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18546,92 +10827,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -457,7 +460,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -469,7 +478,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -477,7 +486,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -498,7 +513,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in	2005-03-05 23:23:48.033323784 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -64,18 +64,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libqca_la_SOURCES)
- DIST_SOURCES = $(libqca_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -220,6 +220,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18663,44 +10861,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in	2005-03-05 23:23:48.067318616 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,18 +90,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libgroupwise_tasks_la_SOURCES)
- DIST_SOURCES = $(libgroupwise_tasks_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18732,44 +10895,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in	2005-03-04 12:37:17.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in	2005-03-05 23:23:48.077317096 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -65,18 +65,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(task_take_test_SOURCES)
- DIST_SOURCES = $(task_take_test_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -221,6 +221,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18801,44 +10929,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in	2005-03-05 23:23:48.172302656 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(client_test_SOURCES) $(clientstream_test_SOURCES) \
- 	$(coreprotocol_test_SOURCES) $(field_test_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18870,45 +10963,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/groupwise/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/groupwise/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/groupwise/ui/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/groupwise/ui/Makefile.in	2005-03-05 23:23:48.190299920 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopetegroupwiseui_la_SOURCES)
- DIST_SOURCES = $(libkopetegroupwiseui_la_SOURCES)
-@@ -231,6 +231,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18918,7 +10976,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,7 +450,7 @@
+@@ -479,7 +482,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18927,7 +10985,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -485,9 +488,9 @@
+@@ -517,9 +520,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18937,47 +10995,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/irc/Makefile.in kdenetwork-3.4.0/kopete/protocols/irc/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/irc/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/irc/Makefile.in	2005-03-05 23:23:48.258289584 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_irc_la_SOURCES)
- DIST_SOURCES = $(kopete_irc_la_SOURCES)
-@@ -263,6 +263,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/ui/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/ui/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -231,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18987,7 +11010,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,7 +494,7 @@
+@@ -447,7 +450,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18996,7 +11019,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -529,9 +532,9 @@
+@@ -485,9 +488,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19006,71 +11029,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -675,7 +678,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -687,7 +696,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -695,7 +704,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -716,7 +731,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/irc/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/irc/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/irc/icons/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/irc/icons/Makefile.in	2005-03-05 23:23:48.265288520 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/irc/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/irc/icons/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/irc/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -19102,44 +11065,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/irc/libkirc/Makefile.in kdenetwork-3.4.0/kopete/protocols/irc/libkirc/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/irc/libkirc/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/irc/libkirc/Makefile.in	2005-03-05 23:23:48.330278640 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -71,18 +71,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkirc_la_SOURCES)
- DIST_SOURCES = $(libkirc_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/irc/libkirc/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/libkirc/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/irc/libkirc/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/irc/libkirc/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -227,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -19171,45 +11099,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/irc/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/irc/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/irc/ui/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/irc/ui/Makefile.in	2005-03-05 23:23:48.346276208 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopeteircui_la_SOURCES)
- DIST_SOURCES = $(libkopeteircui_la_SOURCES)
-@@ -225,6 +225,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/irc/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/irc/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/irc/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -263,6 +263,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19219,7 +11112,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -491,7 +494,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19228,7 +11121,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -529,9 +532,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19238,47 +11131,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/Makefile.in	2005-03-05 23:23:48.431263288 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -99,18 +99,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_jabber_la_SOURCES)
- DIST_SOURCES = $(kopete_jabber_la_SOURCES)
-@@ -272,6 +272,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/irc/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/irc/ui/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/irc/ui/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -225,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19288,7 +11146,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -431,7 +434,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19297,7 +11155,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -469,9 +472,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19307,71 +11165,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -665,7 +668,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -677,7 +686,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -685,7 +694,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -706,7 +721,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/icons/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/icons/Makefile.in	2005-03-05 23:23:48.441261768 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/icons/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -19403,21 +11201,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/Makefile.in	2005-03-05 23:23:48.448260704 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/Makefile.in	2005-05-24 17:07:07.000000000 +0200
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -19449,70 +11235,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/cutestuff/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/cutestuff/Makefile.in	2005-03-05 23:23:48.454259792 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19522,16 +11248,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am  all-recursive
+@@ -428,7 +431,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -466,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19542,94 +11268,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in	2005-03-05 23:23:48.481255688 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,18 +67,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libcutestuff_network_la_SOURCES)
- DIST_SOURCES = $(libcutestuff_network_la_SOURCES)
-@@ -223,6 +223,9 @@
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -225,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19660,45 +11303,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in	2005-03-05 23:23:48.493253864 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libcutestuff_util_la_SOURCES)
- DIST_SOURCES = $(libcutestuff_util_la_SOURCES)
-@@ -225,6 +225,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/include/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/include/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -224,6 +224,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19708,7 +11316,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -422,7 +425,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19717,7 +11325,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -460,9 +463,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19729,22 +11337,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/iris/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/iris/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/iris/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/iris/Makefile.in	2005-03-05 23:23:48.501252648 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -225,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19754,16 +11350,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am  all-recursive
+@@ -426,7 +429,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -464,9 +467,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19774,94 +11370,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/iris/include/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/iris/include/Makefile.in	2005-03-05 23:23:48.512250976 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,18 +68,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libiris_la_SOURCES)
- DIST_SOURCES = $(libiris_la_SOURCES)
-@@ -224,6 +224,9 @@
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19871,16 +11384,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,7 +425,7 @@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -460,9 +463,9 @@
+@@ -434,9 +437,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19891,46 +11404,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in	2005-03-05 23:23:48.562243376 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libiris_jabber_la_SOURCES)
- DIST_SOURCES = $(libiris_jabber_la_SOURCES)
-@@ -225,6 +225,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19940,7 +11418,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -452,7 +455,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19949,7 +11427,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -490,9 +493,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19961,45 +11439,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in	2005-03-05 23:23:48.594238512 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libiris_xmpp_core_la_SOURCES)
- DIST_SOURCES = $(libiris_xmpp_core_la_SOURCES)
-@@ -236,6 +236,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20009,7 +11452,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,7 +455,7 @@
+@@ -426,7 +429,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20018,7 +11461,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -490,9 +493,9 @@
+@@ -464,9 +467,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20030,210 +11473,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -545,124 +548,124 @@
- @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
- 
- libiris_xmpp_core_la-connector.lo: connector.cpp
--#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-connector.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-connector.Tpo" -c -o libiris_xmpp_core_la-connector.lo `test -f 'connector.cpp' || echo '$(srcdir)/'`connector.cpp; \
-+#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-connector.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-connector.Tpo" -c -o libiris_xmpp_core_la-connector.lo `test -f 'connector.cpp' || echo '$(srcdir)/'`connector.cpp; \
- #>- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-connector.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-connector.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-connector.Tpo"; exit 1; fi
- #>+ 2
--@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-connector.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-connector.Tpo" -c -o libiris_xmpp_core_la-connector.lo `test -f 'connector.cpp' || echo '$(srcdir)/'`connector.cpp; \
-+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-connector.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-connector.Tpo" -c -o libiris_xmpp_core_la-connector.lo `test -f 'connector.cpp' || echo '$(srcdir)/'`connector.cpp; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-connector.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-connector.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-connector.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='connector.cpp' object='libiris_xmpp_core_la-connector.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-connector.lo `test -f 'connector.cpp' || echo '$(srcdir)/'`connector.cpp
-+#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-connector.lo `test -f 'connector.cpp' || echo '$(srcdir)/'`connector.cpp
- #>+ 1
--@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-connector.lo `test -f 'connector.cpp' || echo '$(srcdir)/'`connector.cpp
-+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-connector.lo `test -f 'connector.cpp' || echo '$(srcdir)/'`connector.cpp
- 
- libiris_xmpp_core_la-jid.lo: jid.cpp
--#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-jid.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-jid.Tpo" -c -o libiris_xmpp_core_la-jid.lo `test -f 'jid.cpp' || echo '$(srcdir)/'`jid.cpp; \
-+#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-jid.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-jid.Tpo" -c -o libiris_xmpp_core_la-jid.lo `test -f 'jid.cpp' || echo '$(srcdir)/'`jid.cpp; \
- #>- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-jid.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-jid.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-jid.Tpo"; exit 1; fi
- #>+ 2
--@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-jid.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-jid.Tpo" -c -o libiris_xmpp_core_la-jid.lo `test -f 'jid.cpp' || echo '$(srcdir)/'`jid.cpp; \
-+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-jid.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-jid.Tpo" -c -o libiris_xmpp_core_la-jid.lo `test -f 'jid.cpp' || echo '$(srcdir)/'`jid.cpp; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-jid.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-jid.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-jid.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='jid.cpp' object='libiris_xmpp_core_la-jid.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-jid.lo `test -f 'jid.cpp' || echo '$(srcdir)/'`jid.cpp
-+#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-jid.lo `test -f 'jid.cpp' || echo '$(srcdir)/'`jid.cpp
- #>+ 1
--@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-jid.lo `test -f 'jid.cpp' || echo '$(srcdir)/'`jid.cpp
-+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-jid.lo `test -f 'jid.cpp' || echo '$(srcdir)/'`jid.cpp
- 
- libiris_xmpp_core_la-securestream.lo: securestream.cpp
--#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-securestream.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-securestream.Tpo" -c -o libiris_xmpp_core_la-securestream.lo `test -f 'securestream.cpp' || echo '$(srcdir)/'`securestream.cpp; \
-+#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-securestream.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-securestream.Tpo" -c -o libiris_xmpp_core_la-securestream.lo `test -f 'securestream.cpp' || echo '$(srcdir)/'`securestream.cpp; \
- #>- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-securestream.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-securestream.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-securestream.Tpo"; exit 1; fi
- #>+ 2
--@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-securestream.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-securestream.Tpo" -c -o libiris_xmpp_core_la-securestream.lo `test -f 'securestream.cpp' || echo '$(srcdir)/'`securestream.cpp; \
-+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-securestream.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-securestream.Tpo" -c -o libiris_xmpp_core_la-securestream.lo `test -f 'securestream.cpp' || echo '$(srcdir)/'`securestream.cpp; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-securestream.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-securestream.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-securestream.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='securestream.cpp' object='libiris_xmpp_core_la-securestream.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-securestream.lo `test -f 'securestream.cpp' || echo '$(srcdir)/'`securestream.cpp
-+#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-securestream.lo `test -f 'securestream.cpp' || echo '$(srcdir)/'`securestream.cpp
- #>+ 1
--@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-securestream.lo `test -f 'securestream.cpp' || echo '$(srcdir)/'`securestream.cpp
-+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-securestream.lo `test -f 'securestream.cpp' || echo '$(srcdir)/'`securestream.cpp
- 
- libiris_xmpp_core_la-tlshandler.lo: tlshandler.cpp
--#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-tlshandler.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-tlshandler.Tpo" -c -o libiris_xmpp_core_la-tlshandler.lo `test -f 'tlshandler.cpp' || echo '$(srcdir)/'`tlshandler.cpp; \
-+#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-tlshandler.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-tlshandler.Tpo" -c -o libiris_xmpp_core_la-tlshandler.lo `test -f 'tlshandler.cpp' || echo '$(srcdir)/'`tlshandler.cpp; \
- #>- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-tlshandler.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-tlshandler.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-tlshandler.Tpo"; exit 1; fi
- #>+ 2
--@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-tlshandler.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-tlshandler.Tpo" -c -o libiris_xmpp_core_la-tlshandler.lo `test -f 'tlshandler.cpp' || echo '$(srcdir)/'`tlshandler.cpp; \
-+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-tlshandler.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-tlshandler.Tpo" -c -o libiris_xmpp_core_la-tlshandler.lo `test -f 'tlshandler.cpp' || echo '$(srcdir)/'`tlshandler.cpp; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-tlshandler.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-tlshandler.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-tlshandler.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tlshandler.cpp' object='libiris_xmpp_core_la-tlshandler.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-tlshandler.lo `test -f 'tlshandler.cpp' || echo '$(srcdir)/'`tlshandler.cpp
-+#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-tlshandler.lo `test -f 'tlshandler.cpp' || echo '$(srcdir)/'`tlshandler.cpp
- #>+ 1
--@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-tlshandler.lo `test -f 'tlshandler.cpp' || echo '$(srcdir)/'`tlshandler.cpp
-+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-tlshandler.lo `test -f 'tlshandler.cpp' || echo '$(srcdir)/'`tlshandler.cpp
- 
- libiris_xmpp_core_la-hash.lo: hash.cpp
--#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-hash.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-hash.Tpo" -c -o libiris_xmpp_core_la-hash.lo `test -f 'hash.cpp' || echo '$(srcdir)/'`hash.cpp; \
-+#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-hash.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-hash.Tpo" -c -o libiris_xmpp_core_la-hash.lo `test -f 'hash.cpp' || echo '$(srcdir)/'`hash.cpp; \
- #>- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-hash.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-hash.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-hash.Tpo"; exit 1; fi
- #>+ 2
--@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-hash.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-hash.Tpo" -c -o libiris_xmpp_core_la-hash.lo `test -f 'hash.cpp' || echo '$(srcdir)/'`hash.cpp; \
-+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-hash.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-hash.Tpo" -c -o libiris_xmpp_core_la-hash.lo `test -f 'hash.cpp' || echo '$(srcdir)/'`hash.cpp; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-hash.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-hash.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-hash.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hash.cpp' object='libiris_xmpp_core_la-hash.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-hash.lo `test -f 'hash.cpp' || echo '$(srcdir)/'`hash.cpp
-+#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-hash.lo `test -f 'hash.cpp' || echo '$(srcdir)/'`hash.cpp
- #>+ 1
--@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-hash.lo `test -f 'hash.cpp' || echo '$(srcdir)/'`hash.cpp
-+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-hash.lo `test -f 'hash.cpp' || echo '$(srcdir)/'`hash.cpp
- 
- libiris_xmpp_core_la-protocol.lo: protocol.cpp
--#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-protocol.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-protocol.Tpo" -c -o libiris_xmpp_core_la-protocol.lo `test -f 'protocol.cpp' || echo '$(srcdir)/'`protocol.cpp; \
-+#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-protocol.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-protocol.Tpo" -c -o libiris_xmpp_core_la-protocol.lo `test -f 'protocol.cpp' || echo '$(srcdir)/'`protocol.cpp; \
- #>- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-protocol.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-protocol.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-protocol.Tpo"; exit 1; fi
- #>+ 2
--@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-protocol.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-protocol.Tpo" -c -o libiris_xmpp_core_la-protocol.lo `test -f 'protocol.cpp' || echo '$(srcdir)/'`protocol.cpp; \
-+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-protocol.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-protocol.Tpo" -c -o libiris_xmpp_core_la-protocol.lo `test -f 'protocol.cpp' || echo '$(srcdir)/'`protocol.cpp; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-protocol.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-protocol.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-protocol.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='protocol.cpp' object='libiris_xmpp_core_la-protocol.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-protocol.lo `test -f 'protocol.cpp' || echo '$(srcdir)/'`protocol.cpp
-+#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-protocol.lo `test -f 'protocol.cpp' || echo '$(srcdir)/'`protocol.cpp
- #>+ 1
--@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-protocol.lo `test -f 'protocol.cpp' || echo '$(srcdir)/'`protocol.cpp
-+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-protocol.lo `test -f 'protocol.cpp' || echo '$(srcdir)/'`protocol.cpp
- 
- libiris_xmpp_core_la-stream.lo: stream.cpp
--#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-stream.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-stream.Tpo" -c -o libiris_xmpp_core_la-stream.lo `test -f 'stream.cpp' || echo '$(srcdir)/'`stream.cpp; \
-+#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-stream.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-stream.Tpo" -c -o libiris_xmpp_core_la-stream.lo `test -f 'stream.cpp' || echo '$(srcdir)/'`stream.cpp; \
- #>- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-stream.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-stream.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-stream.Tpo"; exit 1; fi
- #>+ 2
--@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-stream.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-stream.Tpo" -c -o libiris_xmpp_core_la-stream.lo `test -f 'stream.cpp' || echo '$(srcdir)/'`stream.cpp; \
-+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-stream.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-stream.Tpo" -c -o libiris_xmpp_core_la-stream.lo `test -f 'stream.cpp' || echo '$(srcdir)/'`stream.cpp; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-stream.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-stream.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-stream.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='stream.cpp' object='libiris_xmpp_core_la-stream.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-stream.lo `test -f 'stream.cpp' || echo '$(srcdir)/'`stream.cpp
-+#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-stream.lo `test -f 'stream.cpp' || echo '$(srcdir)/'`stream.cpp
- #>+ 1
--@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-stream.lo `test -f 'stream.cpp' || echo '$(srcdir)/'`stream.cpp
-+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-stream.lo `test -f 'stream.cpp' || echo '$(srcdir)/'`stream.cpp
- 
- libiris_xmpp_core_la-xmlprotocol.lo: xmlprotocol.cpp
--#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-xmlprotocol.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-xmlprotocol.Tpo" -c -o libiris_xmpp_core_la-xmlprotocol.lo `test -f 'xmlprotocol.cpp' || echo '$(srcdir)/'`xmlprotocol.cpp; \
-+#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-xmlprotocol.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-xmlprotocol.Tpo" -c -o libiris_xmpp_core_la-xmlprotocol.lo `test -f 'xmlprotocol.cpp' || echo '$(srcdir)/'`xmlprotocol.cpp; \
- #>- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-xmlprotocol.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-xmlprotocol.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-xmlprotocol.Tpo"; exit 1; fi
- #>+ 2
--@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-xmlprotocol.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-xmlprotocol.Tpo" -c -o libiris_xmpp_core_la-xmlprotocol.lo `test -f 'xmlprotocol.cpp' || echo '$(srcdir)/'`xmlprotocol.cpp; \
-+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-xmlprotocol.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-xmlprotocol.Tpo" -c -o libiris_xmpp_core_la-xmlprotocol.lo `test -f 'xmlprotocol.cpp' || echo '$(srcdir)/'`xmlprotocol.cpp; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-xmlprotocol.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-xmlprotocol.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-xmlprotocol.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xmlprotocol.cpp' object='libiris_xmpp_core_la-xmlprotocol.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-xmlprotocol.lo `test -f 'xmlprotocol.cpp' || echo '$(srcdir)/'`xmlprotocol.cpp
-+#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-xmlprotocol.lo `test -f 'xmlprotocol.cpp' || echo '$(srcdir)/'`xmlprotocol.cpp
- #>+ 1
--@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-xmlprotocol.lo `test -f 'xmlprotocol.cpp' || echo '$(srcdir)/'`xmlprotocol.cpp
-+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-xmlprotocol.lo `test -f 'xmlprotocol.cpp' || echo '$(srcdir)/'`xmlprotocol.cpp
- 
- libiris_xmpp_core_la-parser.lo: parser.cpp
--#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-parser.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-parser.Tpo" -c -o libiris_xmpp_core_la-parser.lo `test -f 'parser.cpp' || echo '$(srcdir)/'`parser.cpp; \
-+#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-parser.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-parser.Tpo" -c -o libiris_xmpp_core_la-parser.lo `test -f 'parser.cpp' || echo '$(srcdir)/'`parser.cpp; \
- #>- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-parser.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-parser.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-parser.Tpo"; exit 1; fi
- #>+ 2
--@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-parser.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-parser.Tpo" -c -o libiris_xmpp_core_la-parser.lo `test -f 'parser.cpp' || echo '$(srcdir)/'`parser.cpp; \
-+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-parser.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-parser.Tpo" -c -o libiris_xmpp_core_la-parser.lo `test -f 'parser.cpp' || echo '$(srcdir)/'`parser.cpp; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-parser.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-parser.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-parser.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='parser.cpp' object='libiris_xmpp_core_la-parser.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-parser.lo `test -f 'parser.cpp' || echo '$(srcdir)/'`parser.cpp
-+#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-parser.lo `test -f 'parser.cpp' || echo '$(srcdir)/'`parser.cpp
- #>+ 1
--@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-parser.lo `test -f 'parser.cpp' || echo '$(srcdir)/'`parser.cpp
-+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-parser.lo `test -f 'parser.cpp' || echo '$(srcdir)/'`parser.cpp
- 
- libiris_xmpp_core_la-simplesasl.lo: simplesasl.cpp
--#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-simplesasl.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-simplesasl.Tpo" -c -o libiris_xmpp_core_la-simplesasl.lo `test -f 'simplesasl.cpp' || echo '$(srcdir)/'`simplesasl.cpp; \
-+#>- @am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libiris_xmpp_core_la-simplesasl.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-simplesasl.Tpo" -c -o libiris_xmpp_core_la-simplesasl.lo `test -f 'simplesasl.cpp' || echo '$(srcdir)/'`simplesasl.cpp; \
- #>- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-simplesasl.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-simplesasl.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-simplesasl.Tpo"; exit 1; fi
- #>+ 2
--@am__fastdepCXX_TRUE@	if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-simplesasl.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-simplesasl.Tpo" -c -o libiris_xmpp_core_la-simplesasl.lo `test -f 'simplesasl.cpp' || echo '$(srcdir)/'`simplesasl.cpp; \
-+@am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -MT libiris_xmpp_core_la-simplesasl.lo -MD -MP -MF "$(DEPDIR)/libiris_xmpp_core_la-simplesasl.Tpo" -c -o libiris_xmpp_core_la-simplesasl.lo `test -f 'simplesasl.cpp' || echo '$(srcdir)/'`simplesasl.cpp; \
- @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libiris_xmpp_core_la-simplesasl.Tpo" "$(DEPDIR)/libiris_xmpp_core_la-simplesasl.Plo"; else rm -f "$(DEPDIR)/libiris_xmpp_core_la-simplesasl.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='simplesasl.cpp' object='libiris_xmpp_core_la-simplesasl.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-simplesasl.lo `test -f 'simplesasl.cpp' || echo '$(srcdir)/'`simplesasl.cpp
-+#>- @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libiris_xmpp_core_la-simplesasl.lo `test -f 'simplesasl.cpp' || echo '$(srcdir)/'`simplesasl.cpp
- #>+ 1
--@am__fastdepCXX_FALSE@	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-simplesasl.lo `test -f 'simplesasl.cpp' || echo '$(srcdir)/'`simplesasl.cpp
-+@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libiris_xmpp_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -c -o libiris_xmpp_core_la-simplesasl.lo `test -f 'simplesasl.cpp' || echo '$(srcdir)/'`simplesasl.cpp
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in	2005-03-05 23:23:48.620234560 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -66,18 +66,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libiris_xmpp_im_la_SOURCES)
- DIST_SOURCES = $(libiris_xmpp_im_la_SOURCES)
-@@ -222,6 +222,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20243,16 +11486,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,7 +429,7 @@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -464,9 +467,9 @@
+@@ -434,9 +437,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20263,22 +11506,10 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/qca/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/qca/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/qca/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/qca/Makefile.in	2005-03-05 23:23:48.627233496 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -205,6 +205,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -20310,92 +11541,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -457,7 +460,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -469,7 +478,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -477,7 +486,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -498,7 +513,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/libiris/qca/src/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/libiris/qca/src/Makefile.in	2005-03-05 23:23:48.651229848 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -64,18 +64,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libqca_la_SOURCES)
- DIST_SOURCES = $(libqca_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/src/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/src/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -220,6 +220,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -20427,44 +11575,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/jabber/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/jabber/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/jabber/ui/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/jabber/ui/Makefile.in	2005-03-05 23:23:48.676226048 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -272,6 +272,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -512,7 +515,7 @@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopetejabberui_la_SOURCES)
- DIST_SOURCES = $(libkopetejabberui_la_SOURCES)
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -550,9 +553,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/jabber/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -231,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -20496,45 +11643,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/meanwhile/Makefile.in kdenetwork-3.4.0/kopete/protocols/meanwhile/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/meanwhile/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/meanwhile/Makefile.in	2005-03-05 23:23:48.700222400 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -88,18 +88,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_meanwhile_la_SOURCES)
- DIST_SOURCES = $(kopete_meanwhile_la_SOURCES)
-@@ -261,6 +261,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/Makefile.in kdenetwork-3.4.1/kopete/protocols/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/Makefile.in	2005-05-23 18:09:03.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20544,16 +11656,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -399,7 +402,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -531,9 +534,9 @@
+@@ -437,9 +440,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20563,71 +11675,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -638,7 +641,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -650,7 +659,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -658,7 +667,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -679,7 +694,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/meanwhile/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/meanwhile/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/meanwhile/icons/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/meanwhile/icons/Makefile.in	2005-03-05 23:23:48.707221336 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/meanwhile/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -20659,45 +11711,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/meanwhile/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/meanwhile/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/meanwhile/ui/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/meanwhile/ui/Makefile.in	2005-03-05 23:23:48.717219816 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,18 +68,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopetemeanwhileui_la_SOURCES)
- DIST_SOURCES = $(libkopetemeanwhileui_la_SOURCES)
-@@ -224,6 +224,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/meanwhile/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -261,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20707,7 +11724,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -493,7 +496,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20716,7 +11733,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -531,9 +534,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20726,47 +11743,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.4.0/kopete/protocols/msn/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/msn/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/msn/Makefile.in	2005-03-05 23:23:48.810205680 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -96,18 +96,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES)
- DIST_SOURCES = $(kopete_msn_la_SOURCES) \
-@@ -270,6 +270,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/meanwhile/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -224,6 +224,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20776,7 +11758,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +493,7 @@
+@@ -425,7 +428,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20785,7 +11767,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +531,9 @@
+@@ -463,9 +466,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20795,94 +11777,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -693,7 +696,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -705,7 +714,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -713,7 +722,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -734,7 +749,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/msn/config/Makefile.in kdenetwork-3.4.0/kopete/protocols/msn/config/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/msn/config/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/msn/config/Makefile.in	2005-03-05 23:23:48.822203856 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_msn_la_SOURCES)
- DIST_SOURCES = $(kcm_kopete_msn_la_SOURCES)
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/msn/config/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/config/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/msn/config/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/msn/config/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -20914,21 +11813,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/msn/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/msn/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/msn/icons/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/msn/icons/Makefile.in	2005-03-05 23:23:48.831202488 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/msn/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/msn/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/msn/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -20960,45 +11847,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/msn/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/msn/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/msn/ui/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/msn/ui/Makefile.in	2005-03-05 23:23:48.844200512 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,18 +67,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopetemsnui_la_SOURCES)
- DIST_SOURCES = $(libkopetemsnui_la_SOURCES)
-@@ -223,6 +223,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/msn/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/msn/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -267,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21008,7 +11860,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -428,7 +431,7 @@
+@@ -489,7 +492,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21017,7 +11869,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -466,9 +469,9 @@
+@@ -527,9 +530,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21027,47 +11879,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/oscar/Makefile.in kdenetwork-3.4.0/kopete/protocols/oscar/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/oscar/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/oscar/Makefile.in	2005-03-05 23:23:48.861197928 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopete_oscar_la_SOURCES)
- DIST_SOURCES = $(libkopete_oscar_la_SOURCES)
-@@ -250,6 +250,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/msn/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/msn/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/msn/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21077,7 +11894,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -454,7 +457,7 @@
+@@ -428,7 +431,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21086,7 +11903,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -492,9 +495,9 @@
+@@ -466,9 +469,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21096,94 +11913,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -577,7 +580,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -589,7 +598,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -597,7 +606,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -618,7 +633,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/oscar/aim/Makefile.in kdenetwork-3.4.0/kopete/protocols/oscar/aim/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/oscar/aim/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/oscar/aim/Makefile.in	2005-03-05 23:23:48.876195648 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_aim_la_SOURCES)
- DIST_SOURCES = $(kopete_aim_la_SOURCES)
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/aim/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/oscar/aim/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -253,6 +253,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -21215,92 +11949,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -604,7 +607,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -616,7 +625,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -624,7 +633,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -645,7 +660,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/oscar/aim/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/oscar/aim/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/oscar/aim/ui/Makefile.in	2005-03-04 12:37:18.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/oscar/aim/ui/Makefile.in	2005-03-05 23:23:48.888193824 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -70,18 +70,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopeteaimui_la_SOURCES)
- DIST_SOURCES = $(libkopeteaimui_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/aim/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/oscar/aim/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -21332,21 +11983,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/oscar/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/oscar/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/oscar/icons/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/oscar/icons/Makefile.in	2005-03-05 23:23:48.899192152 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/oscar/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -21378,44 +12017,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/oscar/icq/Makefile.in kdenetwork-3.4.0/kopete/protocols/oscar/icq/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/oscar/icq/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/oscar/icq/Makefile.in	2005-03-05 23:23:48.928187744 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_icq_la_SOURCES)
- DIST_SOURCES = $(kopete_icq_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icq/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/oscar/icq/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -254,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -21447,102 +12051,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -625,7 +628,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -637,7 +646,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -645,7 +654,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -666,7 +681,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/oscar/icq/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/oscar/icq/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/oscar/icq/ui/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/oscar/icq/ui/Makefile.in	2005-03-05 23:23:48.945185160 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -72,26 +72,26 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopeteicqui_la_SOURCES)
- DIST_SOURCES = $(libkopeteicqui_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icq/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/oscar/icq/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -21574,57 +12085,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/oscar/liboscar/Makefile.in kdenetwork-3.4.0/kopete/protocols/oscar/liboscar/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/oscar/liboscar/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/oscar/liboscar/Makefile.in	2005-03-05 23:23:49.011175128 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -101,29 +101,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(liboscar_la_SOURCES)
- DIST_SOURCES = $(liboscar_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -269,6 +269,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -21656,44 +12119,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in kdenetwork-3.4.0/kopete/protocols/oscar/liboscar/tests/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/oscar/liboscar/tests/Makefile.in	2005-03-05 23:23:49.025173000 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -80,18 +80,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(logintest_SOURCES) $(ssigrouptest_SOURCES) \
- 	$(userinfotest_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/tests/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/tests/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -21725,45 +12153,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/sms/Makefile.in kdenetwork-3.4.0/kopete/protocols/sms/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/sms/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/sms/Makefile.in	2005-03-05 23:23:49.042170416 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_sms_la_SOURCES)
- DIST_SOURCES = $(kopete_sms_la_SOURCES)
-@@ -256,6 +256,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/oscar/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -250,6 +250,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21773,7 +12166,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -454,7 +457,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21782,7 +12175,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -492,9 +495,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21792,71 +12185,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -616,7 +619,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -628,7 +637,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -636,7 +645,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -657,7 +672,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/sms/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/sms/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/sms/icons/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/sms/icons/Makefile.in	2005-03-05 23:23:49.048169504 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/sms/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/sms/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/sms/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -21888,45 +12221,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/sms/services/Makefile.in kdenetwork-3.4.0/kopete/protocols/sms/services/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/sms/services/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/sms/services/Makefile.in	2005-03-05 23:23:49.062167376 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -70,18 +70,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopetesmsservices_la_SOURCES)
- DIST_SOURCES = $(libkopetesmsservices_la_SOURCES)
-@@ -226,6 +226,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/sms/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/sms/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/sms/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -256,6 +256,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21936,7 +12234,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21945,7 +12243,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21955,47 +12253,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/sms/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/sms/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/sms/ui/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/sms/ui/Makefile.in	2005-03-05 23:23:49.072165856 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,18 +67,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopetesmsui_la_SOURCES)
- DIST_SOURCES = $(libkopetesmsui_la_SOURCES)
-@@ -223,6 +223,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/sms/services/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/services/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/sms/services/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/sms/services/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22005,7 +12268,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -431,7 +434,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22014,7 +12277,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -469,9 +472,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22026,45 +12289,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/testbed/Makefile.in kdenetwork-3.4.0/kopete/protocols/testbed/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/testbed/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/testbed/Makefile.in	2005-03-05 23:23:49.090163120 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -87,18 +87,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_testbed_la_SOURCES)
- DIST_SOURCES = $(kopete_testbed_la_SOURCES)
-@@ -260,6 +260,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/sms/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/sms/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/sms/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22074,7 +12302,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -424,7 +427,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22083,7 +12311,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -462,9 +465,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22093,71 +12321,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -610,7 +613,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -622,7 +631,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -630,7 +639,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -651,7 +666,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/testbed/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/testbed/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/testbed/icons/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/testbed/icons/Makefile.in	2005-03-05 23:23:49.098161904 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/testbed/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/testbed/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/testbed/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/testbed/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -22189,45 +12357,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/winpopup/Makefile.in kdenetwork-3.4.0/kopete/protocols/winpopup/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/winpopup/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/winpopup/Makefile.in	2005-03-05 23:23:49.113159624 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -85,18 +85,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_wp_la_SOURCES)
- DIST_SOURCES = $(kopete_wp_la_SOURCES)
-@@ -257,6 +257,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/testbed/Makefile.in kdenetwork-3.4.1/kopete/protocols/testbed/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/testbed/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/testbed/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22237,7 +12370,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,7 +473,7 @@
+@@ -466,7 +469,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22246,7 +12379,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -508,9 +511,9 @@
+@@ -504,9 +507,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22258,92 +12391,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -632,7 +635,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -644,7 +653,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -652,7 +661,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -673,7 +688,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/winpopup/config/Makefile.in kdenetwork-3.4.0/kopete/protocols/winpopup/config/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/winpopup/config/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/winpopup/config/Makefile.in	2005-03-05 23:23:49.125157800 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_kopete_wp_la_SOURCES)
- DIST_SOURCES = $(kcm_kopete_wp_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/winpopup/config/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/config/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/config/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/winpopup/config/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -22375,21 +12425,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/winpopup/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/winpopup/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/winpopup/icons/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/winpopup/icons/Makefile.in	2005-03-05 23:23:49.132156736 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/winpopup/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/winpopup/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -22421,44 +12459,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in kdenetwork-3.4.0/kopete/protocols/winpopup/libwinpopup/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/winpopup/libwinpopup/Makefile.in	2005-03-05 23:23:49.144154912 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -64,18 +64,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libwinpopup_la_SOURCES)
- DIST_SOURCES = $(libwinpopup_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/libwinpopup/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/winpopup/libwinpopup/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -220,6 +220,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -22490,45 +12493,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/winpopup/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/winpopup/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/winpopup/ui/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/winpopup/ui/Makefile.in	2005-03-05 23:23:49.154153392 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,18 +67,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopetewpui_la_SOURCES)
- DIST_SOURCES = $(libkopetewpui_la_SOURCES)
-@@ -223,6 +223,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/winpopup/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/Makefile.in	2005-05-23 18:09:04.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/winpopup/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -257,6 +257,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22538,7 +12506,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -425,7 +428,7 @@
+@@ -470,7 +473,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22547,7 +12515,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -463,9 +466,9 @@
+@@ -508,9 +511,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22557,47 +12525,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/yahoo/Makefile.in kdenetwork-3.4.0/kopete/protocols/yahoo/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/yahoo/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/yahoo/Makefile.in	2005-03-05 23:23:49.186148528 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kopete_yahoo_la_SOURCES)
- DIST_SOURCES = $(kopete_yahoo_la_SOURCES)
-@@ -255,6 +255,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/winpopup/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/ui/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/winpopup/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22607,7 +12540,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -425,7 +428,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22616,7 +12549,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -463,9 +466,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22626,71 +12559,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -604,7 +607,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -616,7 +625,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -624,7 +633,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -645,7 +660,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/yahoo/icons/Makefile.in kdenetwork-3.4.0/kopete/protocols/yahoo/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/yahoo/icons/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/yahoo/icons/Makefile.in	2005-03-05 23:23:49.194147312 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/yahoo/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/icons/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/yahoo/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -22722,35 +12595,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in kdenetwork-3.4.0/kopete/protocols/yahoo/libyahoo2/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/yahoo/libyahoo2/Makefile.in	2005-03-05 23:23:49.203145944 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -68,11 +68,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libyahoo2_la_SOURCES)
- DIST_SOURCES = $(libyahoo2_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/libyahoo2/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/yahoo/libyahoo2/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -217,6 +217,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -22782,44 +12629,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/protocols/yahoo/ui/Makefile.in kdenetwork-3.4.0/kopete/protocols/yahoo/ui/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/protocols/yahoo/ui/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/protocols/yahoo/ui/Makefile.in	2005-03-05 23:23:49.213144424 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/yahoo/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/yahoo/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -255,6 +255,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -460,7 +463,7 @@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -67,18 +67,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkopeteyahooui_la_SOURCES)
- DIST_SOURCES = $(libkopeteyahooui_la_SOURCES)
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -498,9 +501,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/yahoo/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/ui/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/protocols/yahoo/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -22851,21 +12697,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/sounds/Makefile.in kdenetwork-3.4.0/kopete/sounds/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/sounds/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/sounds/Makefile.in	2005-03-05 23:23:49.220143360 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/sounds/Makefile.in kdenetwork-3.4.1/kopete/sounds/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/sounds/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/sounds/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -22897,22 +12731,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/Makefile.in kdenetwork-3.4.0/kopete/styles/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/Makefile.in	2005-03-05 23:23:49.227142296 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -214,6 +214,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/Adium/Makefile.in kdenetwork-3.4.1/kopete/styles/data/Adium/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/Adium/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/Adium/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22922,8 +12744,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -420,7 +423,7 @@
- all: docs-am  all-recursive
+@@ -392,7 +395,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -22931,7 +12753,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -458,9 +461,9 @@
+@@ -430,9 +433,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22943,69 +12765,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -497,7 +500,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -509,7 +518,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -517,7 +526,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -538,7 +553,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/Adium/Makefile.in kdenetwork-3.4.0/kopete/styles/data/Adium/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/Adium/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/Adium/Makefile.in	2005-03-05 23:23:49.233141384 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23037,22 +12799,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/Makefile.in kdenetwork-3.4.0/kopete/styles/data/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/Makefile.in	2005-03-05 23:23:49.240140320 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23062,7 +12812,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -409,7 +412,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -23071,7 +12821,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -447,9 +450,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23083,70 +12833,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/Makefile.in	2005-03-05 23:23:49.409114632 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23156,8 +12846,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am  all-recursive
+@@ -392,7 +395,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -23165,7 +12855,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -430,9 +433,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23177,69 +12867,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/blue/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/blue/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/blue/From/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/blue/From/Makefile.in	2005-03-05 23:23:49.415113720 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23271,21 +12901,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/blue/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/blue/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/blue/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/blue/Makefile.in	2005-03-05 23:23:49.422112656 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23317,69 +12935,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/blue/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/blue/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/blue/To/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/blue/To/Makefile.in	2005-03-05 23:23:49.428111744 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23411,21 +12969,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/clear/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/clear/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/clear/From/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/clear/From/Makefile.in	2005-03-05 23:23:49.434110832 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23457,21 +13003,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/clear/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/clear/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/clear/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/clear/Makefile.in	2005-03-05 23:23:49.442109616 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23503,69 +13037,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/clear/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/clear/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/clear/To/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/clear/To/Makefile.in	2005-03-05 23:23:49.448108704 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23597,21 +13071,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/graphite/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/graphite/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/graphite/From/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/graphite/From/Makefile.in	2005-03-05 23:23:49.454107792 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23643,21 +13105,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/graphite/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/graphite/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/graphite/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/graphite/Makefile.in	2005-03-05 23:23:49.462106576 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23689,69 +13139,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/graphite/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/graphite/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/graphite/To/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/graphite/To/Makefile.in	2005-03-05 23:23:49.468105664 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23783,21 +13173,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/green/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/green/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/green/From/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/green/From/Makefile.in	2005-03-05 23:23:49.474104752 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -204,6 +204,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-recursive
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23829,21 +13241,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/green/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/green/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/green/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/green/Makefile.in	2005-03-05 23:23:49.480103840 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23875,69 +13275,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/green/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/green/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/green/To/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/green/To/Makefile.in	2005-03-05 23:23:49.487102776 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -23969,21 +13309,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/orange/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/orange/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/orange/From/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/orange/From/Makefile.in	2005-03-05 23:23:49.493101864 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/From/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24015,21 +13343,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/orange/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/orange/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/orange/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/orange/Makefile.in	2005-03-05 23:23:49.501100648 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24061,69 +13377,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/orange/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/orange/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/orange/To/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/orange/To/Makefile.in	2005-03-05 23:23:49.507099736 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/To/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24155,21 +13411,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/pink/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/pink/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/pink/From/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/pink/From/Makefile.in	2005-03-05 23:23:49.513098824 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/From/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24201,21 +13445,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/pink/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/pink/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/pink/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/pink/Makefile.in	2005-03-05 23:23:49.519097912 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24247,69 +13479,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/pink/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/pink/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/pink/To/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/pink/To/Makefile.in	2005-03-05 23:23:49.525097000 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/To/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24341,21 +13513,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/purple/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/purple/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/purple/From/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/purple/From/Makefile.in	2005-03-05 23:23:49.531096088 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/From/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24387,21 +13547,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/purple/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/purple/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/purple/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/purple/Makefile.in	2005-03-05 23:23:49.539094872 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24433,69 +13581,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/purple/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/purple/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/purple/To/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/purple/To/Makefile.in	2005-03-05 23:23:49.546093808 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/To/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24527,21 +13615,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/yellow/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/yellow/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/yellow/From/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/yellow/From/Makefile.in	2005-03-05 23:23:49.551093048 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/From/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24573,21 +13649,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/yellow/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/yellow/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/yellow/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/yellow/Makefile.in	2005-03-05 23:23:49.558091984 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24619,69 +13683,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat/yellow/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat/yellow/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat/yellow/To/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat/yellow/To/Makefile.in	2005-03-05 23:23:49.564091072 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/To/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24713,115 +13717,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/Makefile.in	2005-03-05 23:23:49.246139408 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/blue/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/blue/From/Makefile.in	2005-03-05 23:23:49.252138496 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/From/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24853,21 +13751,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/blue/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/blue/Makefile.in	2005-03-05 23:23:49.260137280 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24899,69 +13785,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/blue/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/blue/To/Makefile.in	2005-03-05 23:23:49.266136368 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -24993,21 +13819,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/clear/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/clear/From/Makefile.in	2005-03-05 23:23:49.272135456 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25039,21 +13853,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/clear/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/clear/Makefile.in	2005-03-05 23:23:49.279134392 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25085,69 +13887,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/clear/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/clear/To/Makefile.in	2005-03-05 23:23:49.285133480 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25179,21 +13921,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in	2005-03-05 23:23:49.291132568 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25225,21 +13955,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/graphite/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/graphite/Makefile.in	2005-03-05 23:23:49.299131352 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25271,69 +13989,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in	2005-03-05 23:23:49.305130440 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25365,21 +14023,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/green/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/green/From/Makefile.in	2005-03-05 23:23:49.311129528 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -204,6 +204,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-recursive
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -434,9 +437,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25411,21 +14091,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/green/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/green/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/green/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/green/Makefile.in	2005-03-05 23:23:49.318128464 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25457,69 +14125,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/green/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/green/To/Makefile.in	2005-03-05 23:23:49.324127552 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25551,21 +14159,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/orange/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/orange/From/Makefile.in	2005-03-05 23:23:49.330126640 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25597,21 +14193,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/orange/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/orange/Makefile.in	2005-03-05 23:23:49.338125424 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25643,69 +14227,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/orange/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/orange/To/Makefile.in	2005-03-05 23:23:49.344124512 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25737,21 +14261,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/pink/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/pink/From/Makefile.in	2005-03-05 23:23:49.350123600 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25783,21 +14295,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/pink/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/pink/Makefile.in	2005-03-05 23:23:49.357122536 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25829,69 +14329,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/pink/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/pink/To/Makefile.in	2005-03-05 23:23:49.363121624 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25923,21 +14363,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/purple/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/purple/From/Makefile.in	2005-03-05 23:23:49.369120712 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -25969,21 +14397,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/purple/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/purple/Makefile.in	2005-03-05 23:23:49.376119648 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26015,69 +14431,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/purple/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/purple/To/Makefile.in	2005-03-05 23:23:49.383118584 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26109,22 +14465,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in	2005-03-05 23:23:49.389117672 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -198,6 +198,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/Makefile.in kdenetwork-3.4.1/kopete/styles/data/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/data/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26134,8 +14478,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
- all: docs-am  all-am
+@@ -396,7 +399,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -26143,7 +14487,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -430,9 +433,9 @@
+@@ -434,9 +437,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26155,21 +14499,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/yellow/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/yellow/Makefile.in	2005-03-05 23:23:49.396116608 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/Makefile.in kdenetwork-3.4.1/kopete/styles/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/Makefile.in	2005-05-23 18:09:05.000000000 +0200
++++ kdenetwork-3.4.1/kopete/styles/Makefile.in	2005-05-24 17:07:08.000000000 +0200
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26180,7 +14512,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -409,7 +412,7 @@
+@@ -420,7 +423,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -26189,7 +14521,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -447,9 +450,9 @@
+@@ -458,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26201,115 +14533,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -486,7 +489,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -498,7 +507,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -506,7 +515,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -527,7 +542,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
---- kdenetwork-3.4.0.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in	2005-03-04 12:37:19.000000000 +0000
-+++ kdenetwork-3.4.0/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in	2005-03-05 23:23:49.402115696 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -198,6 +198,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -392,7 +395,7 @@
- all: docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -430,9 +433,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kpf/Makefile.in kdenetwork-3.4.0/kpf/Makefile.in
---- kdenetwork-3.4.0.orig/kpf/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kpf/Makefile.in	2005-03-05 23:23:49.573089704 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kpf/Makefile.in kdenetwork-3.4.1/kpf/Makefile.in
+--- kdenetwork-3.4.1.orig/kpf/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kpf/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -216,6 +216,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26341,92 +14567,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -508,7 +511,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -520,7 +529,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -528,7 +537,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -549,7 +564,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kpf/src/Makefile.in kdenetwork-3.4.0/kpf/src/Makefile.in
---- kdenetwork-3.4.0.orig/kpf/src/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kpf/src/Makefile.in	2005-03-05 23:23:49.640079520 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -104,18 +104,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kpf_panelapplet_la_SOURCES) \
- 	$(kpfpropertiesdialog_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/kpf/src/Makefile.in kdenetwork-3.4.1/kpf/src/Makefile.in
+--- kdenetwork-3.4.1.orig/kpf/src/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kpf/src/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -263,6 +263,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26458,21 +14601,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Makefile.in kdenetwork-3.4.0/kppp/DB/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Makefile.in	2005-03-05 23:23:49.647078456 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Makefile.in kdenetwork-3.4.1/kppp/DB/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26504,69 +14635,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -457,7 +460,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -469,7 +478,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -477,7 +486,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -498,7 +513,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Austria/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Austria/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Austria/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Austria/Makefile.in	2005-03-05 23:23:49.653077544 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Austria/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Austria/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Austria/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Austria/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26598,21 +14669,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Belarus/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Belarus/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Belarus/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Belarus/Makefile.in	2005-03-05 23:23:49.660076480 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Belarus/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Belarus/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Belarus/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Belarus/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26644,21 +14703,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Czech_Republic/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Czech_Republic/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Czech_Republic/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Czech_Republic/Makefile.in	2005-03-05 23:23:49.666075568 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Czech_Republic/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Czech_Republic/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Czech_Republic/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Czech_Republic/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26690,21 +14737,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Denmark/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Denmark/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Denmark/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Denmark/Makefile.in	2005-03-05 23:23:49.672074656 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Denmark/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Denmark/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Denmark/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Denmark/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26736,21 +14771,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/France/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/France/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/France/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/France/Makefile.in	2005-03-05 23:23:49.678073744 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/France/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/France/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/France/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/France/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26782,21 +14805,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Germany/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Germany/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Germany/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Germany/Makefile.in	2005-03-05 23:23:49.684072832 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Germany/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Germany/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Germany/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Germany/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26828,21 +14839,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Ireland/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Ireland/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Ireland/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Ireland/Makefile.in	2005-03-05 23:23:49.690071920 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Ireland/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Ireland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Ireland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Ireland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26874,21 +14873,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Makefile.in	2005-03-05 23:23:49.697070856 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -26920,69 +14907,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -459,7 +462,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -471,7 +480,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -479,7 +488,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -500,7 +515,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Netherlands/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Netherlands/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Netherlands/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Netherlands/Makefile.in	2005-03-05 23:23:49.705069640 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Netherlands/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Netherlands/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Netherlands/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Netherlands/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27014,21 +14941,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/New_Zealand/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/New_Zealand/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/New_Zealand/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/New_Zealand/Makefile.in	2005-03-05 23:23:49.711068728 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/New_Zealand/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/New_Zealand/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/New_Zealand/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/New_Zealand/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27060,21 +14975,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Norway/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Norway/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Norway/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Norway/Makefile.in	2005-03-05 23:23:49.716067968 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Norway/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Norway/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Norway/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Norway/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27106,21 +15009,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Portugal/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Portugal/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Portugal/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Portugal/Makefile.in	2005-03-05 23:23:49.722067056 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Portugal/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Portugal/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Portugal/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Portugal/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27152,21 +15043,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Slovenia/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Slovenia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Slovenia/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Slovenia/Makefile.in	2005-03-05 23:23:49.728066144 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Slovenia/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Slovenia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Slovenia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Slovenia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27198,21 +15077,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Sweden/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Sweden/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Sweden/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Sweden/Makefile.in	2005-03-05 23:23:49.734065232 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Sweden/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Sweden/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Sweden/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Sweden/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27244,21 +15111,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Switzerland/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Switzerland/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Switzerland/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Switzerland/Makefile.in	2005-03-05 23:23:49.741064168 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Switzerland/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Switzerland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Switzerland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Switzerland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27290,21 +15145,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Taiwan/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Taiwan/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Taiwan/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Taiwan/Makefile.in	2005-03-05 23:23:49.747063256 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Taiwan/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Taiwan/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Taiwan/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Taiwan/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27336,21 +15179,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Ukraine/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Ukraine/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Ukraine/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Ukraine/Makefile.in	2005-03-05 23:23:49.753062344 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Ukraine/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Ukraine/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Ukraine/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Ukraine/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27382,21 +15213,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/United_Kingdom/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/United_Kingdom/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/United_Kingdom/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/United_Kingdom/Makefile.in	2005-03-05 23:23:49.759061432 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/United_Kingdom/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/United_Kingdom/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/United_Kingdom/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/United_Kingdom/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27428,21 +15247,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/DB/Provider/Yugoslavia/Makefile.in kdenetwork-3.4.0/kppp/DB/Provider/Yugoslavia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/DB/Provider/Yugoslavia/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/DB/Provider/Yugoslavia/Makefile.in	2005-03-05 23:23:49.765060520 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Yugoslavia/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Yugoslavia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Yugoslavia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/DB/Provider/Yugoslavia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27474,44 +15281,77 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Makefile.in kdenetwork-3.4.0/kppp/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Makefile.in	2005-03-05 23:23:49.881042888 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
+diff -Nrua kdenetwork-3.4.1.orig/kppp/icons/Makefile.in kdenetwork-3.4.1/kppp/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/icons/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/icons/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -188,6 +188,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -380,7 +383,7 @@
+ all: docs-am  all-am
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -98,18 +98,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kppp_SOURCES)
- DIST_SOURCES = $(kppp_SOURCES)
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -418,9 +421,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kppp/logview/Makefile.in kdenetwork-3.4.1/kppp/logview/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/logview/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/logview/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -254,6 +254,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -468,7 +471,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -506,9 +509,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Makefile.in kdenetwork-3.4.1/kppp/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -277,6 +277,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27543,69 +15383,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -789,7 +792,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -801,7 +810,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -809,7 +818,13 @@
+diff -Nrua kdenetwork-3.4.1.orig/kppp/pixmaps/Makefile.in kdenetwork-3.4.1/kppp/pixmaps/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/pixmaps/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/kppp/pixmaps/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -198,6 +198,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -398,7 +401,7 @@
+ all: docs-am  all-am
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -830,7 +845,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Argentina/Makefile.in kdenetwork-3.4.0/kppp/Rules/Argentina/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Argentina/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Argentina/Makefile.in	2005-03-05 23:23:49.888041824 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -436,9 +439,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Argentina/Makefile.in kdenetwork-3.4.1/kppp/Rules/Argentina/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Argentina/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Argentina/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27637,21 +15451,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Australia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Australia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Australia/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Australia/Makefile.in	2005-03-05 23:23:49.894040912 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Australia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Australia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Australia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Australia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27683,21 +15485,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Austria/Business_1/Makefile.in kdenetwork-3.4.0/kppp/Rules/Austria/Business_1/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Austria/Business_1/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Austria/Business_1/Makefile.in	2005-03-05 23:23:49.900040000 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_1/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Business_1/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_1/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Austria/Business_1/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27729,21 +15519,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Austria/Business_2/Makefile.in kdenetwork-3.4.0/kppp/Rules/Austria/Business_2/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Austria/Business_2/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Austria/Business_2/Makefile.in	2005-03-05 23:23:49.906039088 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_2/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Business_2/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_2/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Austria/Business_2/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27775,21 +15553,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Austria/Makefile.in kdenetwork-3.4.0/kppp/Rules/Austria/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Austria/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Austria/Makefile.in	2005-03-05 23:23:49.913038024 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Austria/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Austria/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27821,69 +15587,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -460,7 +463,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -472,7 +481,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -480,7 +489,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -501,7 +516,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Austria/Minimum/Makefile.in kdenetwork-3.4.0/kppp/Rules/Austria/Minimum/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Austria/Minimum/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Austria/Minimum/Makefile.in	2005-03-05 23:23:49.919037112 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Austria/Minimum/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Minimum/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Minimum/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Austria/Minimum/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27915,21 +15621,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Austria/Standard/Makefile.in kdenetwork-3.4.0/kppp/Rules/Austria/Standard/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Austria/Standard/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Austria/Standard/Makefile.in	2005-03-05 23:23:49.925036200 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Austria/Standard/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Standard/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Standard/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Austria/Standard/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -27961,21 +15655,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Bangladesh/Makefile.in kdenetwork-3.4.0/kppp/Rules/Bangladesh/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Bangladesh/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Bangladesh/Makefile.in	2005-03-05 23:23:49.931035288 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Bangladesh/Makefile.in kdenetwork-3.4.1/kppp/Rules/Bangladesh/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Bangladesh/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Bangladesh/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28007,21 +15689,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Belgium/Makefile.in kdenetwork-3.4.0/kppp/Rules/Belgium/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Belgium/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Belgium/Makefile.in	2005-03-05 23:23:49.938034224 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Belgium/Makefile.in kdenetwork-3.4.1/kppp/Rules/Belgium/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Belgium/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Belgium/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28053,21 +15723,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in kdenetwork-3.4.0/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in	2005-03-05 23:23:49.944033312 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in kdenetwork-3.4.1/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28099,21 +15757,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Brasil/Makefile.in kdenetwork-3.4.0/kppp/Rules/Brasil/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Brasil/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Brasil/Makefile.in	2005-03-05 23:23:49.950032400 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Brasil/Makefile.in kdenetwork-3.4.1/kppp/Rules/Brasil/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Brasil/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Brasil/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28145,21 +15791,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Croatia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Croatia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Croatia/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Croatia/Makefile.in	2005-03-05 23:23:49.956031488 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Croatia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Croatia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Croatia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Croatia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28191,21 +15825,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Czechia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Czechia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Czechia/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Czechia/Makefile.in	2005-03-05 23:23:49.962030576 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Czechia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Czechia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Czechia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Czechia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28237,21 +15859,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Denmark/Makefile.in kdenetwork-3.4.0/kppp/Rules/Denmark/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Denmark/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Denmark/Makefile.in	2005-03-05 23:23:49.968029664 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Denmark/Makefile.in kdenetwork-3.4.1/kppp/Rules/Denmark/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Denmark/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Denmark/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28283,21 +15893,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Estonia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Estonia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Estonia/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Estonia/Makefile.in	2005-03-05 23:23:49.973028904 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Estonia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Estonia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Estonia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Estonia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28329,21 +15927,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Finland/Makefile.in kdenetwork-3.4.0/kppp/Rules/Finland/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Finland/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Finland/Makefile.in	2005-03-05 23:23:49.980027840 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Finland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Finland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Finland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Finland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28375,21 +15961,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/France/Makefile.in kdenetwork-3.4.0/kppp/Rules/France/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/France/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/France/Makefile.in	2005-03-05 23:23:49.987026776 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/France/Makefile.in kdenetwork-3.4.1/kppp/Rules/France/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/France/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/France/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28421,21 +15995,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Germany/Makefile.in kdenetwork-3.4.0/kppp/Rules/Germany/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Germany/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Germany/Makefile.in	2005-03-05 23:23:49.993025864 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Germany/Makefile.in kdenetwork-3.4.1/kppp/Rules/Germany/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Germany/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Germany/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28467,21 +16029,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Greece/Makefile.in kdenetwork-3.4.0/kppp/Rules/Greece/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Greece/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Greece/Makefile.in	2005-03-05 23:23:49.999024952 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Greece/Makefile.in kdenetwork-3.4.1/kppp/Rules/Greece/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Greece/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Greece/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28513,21 +16063,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/HongKong/Makefile.in kdenetwork-3.4.0/kppp/Rules/HongKong/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/HongKong/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/HongKong/Makefile.in	2005-03-05 23:23:50.005024040 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/HongKong/Makefile.in kdenetwork-3.4.1/kppp/Rules/HongKong/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/HongKong/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/HongKong/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28559,21 +16097,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Hungary/Makefile.in kdenetwork-3.4.0/kppp/Rules/Hungary/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Hungary/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Hungary/Makefile.in	2005-03-05 23:23:50.011023128 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Hungary/Makefile.in kdenetwork-3.4.1/kppp/Rules/Hungary/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Hungary/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Hungary/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28605,21 +16131,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Iceland/Makefile.in kdenetwork-3.4.0/kppp/Rules/Iceland/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Iceland/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Iceland/Makefile.in	2005-03-05 23:23:50.016022368 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Iceland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Iceland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Iceland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Iceland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28651,21 +16165,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/India/Makefile.in kdenetwork-3.4.0/kppp/Rules/India/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/India/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/India/Makefile.in	2005-03-05 23:23:50.023021304 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/India/Makefile.in kdenetwork-3.4.1/kppp/Rules/India/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/India/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/India/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28697,21 +16199,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Indonesia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Indonesia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Indonesia/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Indonesia/Makefile.in	2005-03-05 23:23:50.029020392 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Indonesia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Indonesia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Indonesia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Indonesia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28743,21 +16233,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Ireland/Makefile.in kdenetwork-3.4.0/kppp/Rules/Ireland/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Ireland/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Ireland/Makefile.in	2005-03-05 23:23:50.035019480 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Ireland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Ireland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Ireland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Ireland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28789,21 +16267,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Israel/Makefile.in kdenetwork-3.4.0/kppp/Rules/Israel/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Israel/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Israel/Makefile.in	2005-03-05 23:23:50.041018568 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Israel/Makefile.in kdenetwork-3.4.1/kppp/Rules/Israel/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Israel/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Israel/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28835,21 +16301,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Italy/Makefile.in kdenetwork-3.4.0/kppp/Rules/Italy/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Italy/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Italy/Makefile.in	2005-03-05 23:23:50.047017656 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Italy/Makefile.in kdenetwork-3.4.1/kppp/Rules/Italy/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Italy/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Italy/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28860,7 +16314,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -417,7 +420,7 @@
+@@ -420,7 +423,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28869,7 +16323,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -455,9 +458,9 @@
+@@ -458,9 +461,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28881,21 +16335,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Jamaica/Makefile.in kdenetwork-3.4.0/kppp/Rules/Jamaica/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Jamaica/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Jamaica/Makefile.in	2005-03-05 23:23:50.053016744 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Jamaica/Makefile.in kdenetwork-3.4.1/kppp/Rules/Jamaica/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Jamaica/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Jamaica/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28927,21 +16369,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Japan/Makefile.in kdenetwork-3.4.0/kppp/Rules/Japan/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Japan/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Japan/Makefile.in	2005-03-05 23:23:50.060015680 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Japan/Makefile.in kdenetwork-3.4.1/kppp/Rules/Japan/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Japan/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Japan/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -28973,21 +16403,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Kazakhstan/Makefile.in kdenetwork-3.4.0/kppp/Rules/Kazakhstan/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Kazakhstan/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Kazakhstan/Makefile.in	2005-03-05 23:23:50.066014768 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Kazakhstan/Makefile.in kdenetwork-3.4.1/kppp/Rules/Kazakhstan/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Kazakhstan/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Kazakhstan/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29019,21 +16437,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Luxembourg/Makefile.in kdenetwork-3.4.0/kppp/Rules/Luxembourg/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Luxembourg/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Luxembourg/Makefile.in	2005-03-05 23:23:50.071014008 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Luxembourg/Makefile.in kdenetwork-3.4.1/kppp/Rules/Luxembourg/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Luxembourg/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Luxembourg/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29065,21 +16471,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Macedonia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Macedonia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Macedonia/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Macedonia/Makefile.in	2005-03-05 23:23:50.077013096 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Macedonia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Macedonia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Macedonia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Macedonia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29111,21 +16505,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Makefile.in kdenetwork-3.4.0/kppp/Rules/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Makefile.in	2005-03-05 23:23:50.086011728 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Makefile.in kdenetwork-3.4.1/kppp/Rules/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -217,6 +217,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29157,69 +16539,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-pkgSCRIPTS: $(pkg_SCRIPTS)
  	@$(NORMAL_INSTALL)
-@@ -511,7 +514,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -523,7 +532,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -531,7 +540,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -552,7 +567,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Malaysia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Malaysia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Malaysia/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Malaysia/Makefile.in	2005-03-05 23:23:50.092010816 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Malaysia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Malaysia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Malaysia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Malaysia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29251,21 +16573,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Netherlands/Makefile.in kdenetwork-3.4.0/kppp/Rules/Netherlands/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Netherlands/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Netherlands/Makefile.in	2005-03-05 23:23:50.099009752 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Netherlands/Makefile.in kdenetwork-3.4.1/kppp/Rules/Netherlands/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Netherlands/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Netherlands/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29297,21 +16607,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Norway/Makefile.in kdenetwork-3.4.0/kppp/Rules/Norway/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Norway/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Norway/Makefile.in	2005-03-05 23:23:50.105008840 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Norway/Makefile.in kdenetwork-3.4.1/kppp/Rules/Norway/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Norway/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Norway/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29343,21 +16641,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Poland/Makefile.in kdenetwork-3.4.0/kppp/Rules/Poland/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Poland/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Poland/Makefile.in	2005-03-05 23:23:50.111007928 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Poland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Poland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Poland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Poland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29389,21 +16675,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Portugal/Makefile.in kdenetwork-3.4.0/kppp/Rules/Portugal/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Portugal/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Portugal/Makefile.in	2005-03-05 23:23:50.117007016 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Portugal/Makefile.in kdenetwork-3.4.1/kppp/Rules/Portugal/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Portugal/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Portugal/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29435,21 +16709,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Romania/Makefile.in kdenetwork-3.4.0/kppp/Rules/Romania/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Romania/Makefile.in	2005-03-04 12:37:20.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Romania/Makefile.in	2005-03-05 23:23:50.123006104 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Romania/Makefile.in kdenetwork-3.4.1/kppp/Rules/Romania/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Romania/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Romania/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29481,21 +16743,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Russia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Russia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Russia/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Russia/Makefile.in	2005-03-05 23:23:50.129005192 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Russia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Russia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Russia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Russia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29527,21 +16777,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Singapore/Makefile.in kdenetwork-3.4.0/kppp/Rules/Singapore/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Singapore/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Singapore/Makefile.in	2005-03-05 23:23:50.135004280 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Singapore/Makefile.in kdenetwork-3.4.1/kppp/Rules/Singapore/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Singapore/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Singapore/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29573,21 +16811,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Slovakia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Slovakia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Slovakia/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Slovakia/Makefile.in	2005-03-05 23:23:50.142003216 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Slovakia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Slovakia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Slovakia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Slovakia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29619,21 +16845,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Slovenia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Slovenia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Slovenia/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Slovenia/Makefile.in	2005-03-05 23:23:50.148002304 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Slovenia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Slovenia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Slovenia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Slovenia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29665,21 +16879,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/SouthAfrica/Makefile.in kdenetwork-3.4.0/kppp/Rules/SouthAfrica/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/SouthAfrica/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/SouthAfrica/Makefile.in	2005-03-05 23:23:50.153001544 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrica/Makefile.in kdenetwork-3.4.1/kppp/Rules/SouthAfrica/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrica/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/SouthAfrica/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29711,21 +16913,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/SouthAfrika/Makefile.in kdenetwork-3.4.0/kppp/Rules/SouthAfrika/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/SouthAfrika/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/SouthAfrika/Makefile.in	2005-03-05 23:23:50.159000632 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrika/Makefile.in kdenetwork-3.4.1/kppp/Rules/SouthAfrika/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrika/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/SouthAfrika/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29757,21 +16947,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Spain/Makefile.in kdenetwork-3.4.0/kppp/Rules/Spain/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Spain/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Spain/Makefile.in	2005-03-05 23:23:50.164999720 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Spain/Makefile.in kdenetwork-3.4.1/kppp/Rules/Spain/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Spain/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Spain/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29803,21 +16981,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Sweden/Makefile.in kdenetwork-3.4.0/kppp/Rules/Sweden/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Sweden/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Sweden/Makefile.in	2005-03-05 23:23:50.171998656 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Sweden/Makefile.in kdenetwork-3.4.1/kppp/Rules/Sweden/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Sweden/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Sweden/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29849,21 +17015,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Switzerland/Makefile.in kdenetwork-3.4.0/kppp/Rules/Switzerland/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Switzerland/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Switzerland/Makefile.in	2005-03-05 23:23:50.177997744 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Switzerland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Switzerland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Switzerland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Switzerland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29895,21 +17049,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Turkey/Makefile.in kdenetwork-3.4.0/kppp/Rules/Turkey/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Turkey/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Turkey/Makefile.in	2005-03-05 23:23:50.183996832 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Turkey/Makefile.in kdenetwork-3.4.1/kppp/Rules/Turkey/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Turkey/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Turkey/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29941,21 +17083,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Ukraine/Makefile.in kdenetwork-3.4.0/kppp/Rules/Ukraine/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Ukraine/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Ukraine/Makefile.in	2005-03-05 23:23:50.189995920 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Ukraine/Makefile.in kdenetwork-3.4.1/kppp/Rules/Ukraine/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Ukraine/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Ukraine/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -29987,21 +17117,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/United_Kingdom/Makefile.in kdenetwork-3.4.0/kppp/Rules/United_Kingdom/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/United_Kingdom/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/United_Kingdom/Makefile.in	2005-03-05 23:23:50.195995008 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/United_Kingdom/Makefile.in kdenetwork-3.4.1/kppp/Rules/United_Kingdom/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/United_Kingdom/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/United_Kingdom/Makefile.in	2005-05-24 17:07:09.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30033,21 +17151,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Uruguay/Makefile.in kdenetwork-3.4.0/kppp/Rules/Uruguay/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Uruguay/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Uruguay/Makefile.in	2005-03-05 23:23:50.201994096 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Uruguay/Makefile.in kdenetwork-3.4.1/kppp/Rules/Uruguay/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Uruguay/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Uruguay/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30079,21 +17185,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/Rules/Yugoslavia/Makefile.in kdenetwork-3.4.0/kppp/Rules/Yugoslavia/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/Rules/Yugoslavia/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/Rules/Yugoslavia/Makefile.in	2005-03-05 23:23:50.208993032 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Yugoslavia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Yugoslavia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Yugoslavia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
++++ kdenetwork-3.4.1/kppp/Rules/Yugoslavia/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30125,205 +17219,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/icons/Makefile.in kdenetwork-3.4.0/kppp/icons/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/icons/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/icons/Makefile.in	2005-03-05 23:23:50.215991968 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -188,6 +188,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -380,7 +383,7 @@
- all: docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -418,9 +421,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/kppp/logview/Makefile.in kdenetwork-3.4.0/kppp/logview/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/logview/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/logview/Makefile.in	2005-03-05 23:23:50.235988928 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kppplogview_SOURCES)
- DIST_SOURCES = $(kppplogview_SOURCES)
-@@ -254,6 +254,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -506,9 +509,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/kppp/pixmaps/Makefile.in kdenetwork-3.4.0/kppp/pixmaps/Makefile.in
---- kdenetwork-3.4.0.orig/kppp/pixmaps/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/kppp/pixmaps/Makefile.in	2005-03-05 23:23:50.241988016 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -198,6 +198,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -398,7 +401,7 @@
- all: docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -436,9 +439,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/krdc/Makefile.in kdenetwork-3.4.0/krdc/Makefile.in
---- kdenetwork-3.4.0.orig/krdc/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/krdc/Makefile.in	2005-03-05 23:23:50.282981784 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(krdc_SOURCES)
- DIST_SOURCES = $(krdc_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/krdc/Makefile.in kdenetwork-3.4.1/krdc/Makefile.in
+--- kdenetwork-3.4.1.orig/krdc/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/krdc/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -273,6 +273,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30355,92 +17253,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -713,7 +716,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -725,7 +734,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -733,7 +742,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -754,7 +769,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/krdc/rdp/Makefile.in kdenetwork-3.4.0/krdc/rdp/Makefile.in
---- kdenetwork-3.4.0.orig/krdc/rdp/Makefile.in	2005-03-04 12:37:21.000000000 +0000
-+++ kdenetwork-3.4.0/krdc/rdp/Makefile.in	2005-03-05 23:23:50.295979808 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -70,18 +70,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(librdp_la_SOURCES)
- DIST_SOURCES = $(librdp_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/krdc/rdp/Makefile.in kdenetwork-3.4.1/krdc/rdp/Makefile.in
+--- kdenetwork-3.4.1.orig/krdc/rdp/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/krdc/rdp/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -227,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30472,57 +17287,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/krdc/vnc/Makefile.in kdenetwork-3.4.0/krdc/vnc/Makefile.in
---- kdenetwork-3.4.0.orig/krdc/vnc/Makefile.in	2005-03-04 12:37:22.000000000 +0000
-+++ kdenetwork-3.4.0/krdc/vnc/Makefile.in	2005-03-05 23:23:50.314976920 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,29 +69,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libvnc_la_SOURCES)
- DIST_SOURCES = $(libvnc_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/krdc/vnc/Makefile.in kdenetwork-3.4.1/krdc/vnc/Makefile.in
+--- kdenetwork-3.4.1.orig/krdc/vnc/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/krdc/vnc/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30554,138 +17321,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/krfb/Makefile.in kdenetwork-3.4.0/krfb/Makefile.in
---- kdenetwork-3.4.0.orig/krfb/Makefile.in	2005-03-04 12:37:22.000000000 +0000
-+++ kdenetwork-3.4.0/krfb/Makefile.in	2005-03-05 23:23:50.321975856 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -205,6 +205,9 @@
- LIB_XSS = @LIB_XSS@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -402,7 +405,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -440,9 +443,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -462,7 +465,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -474,7 +483,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -482,7 +491,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -503,7 +518,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/krfb/kcm_krfb/Makefile.in kdenetwork-3.4.0/krfb/kcm_krfb/Makefile.in
---- kdenetwork-3.4.0.orig/krfb/kcm_krfb/Makefile.in	2005-03-04 12:37:23.000000000 +0000
-+++ kdenetwork-3.4.0/krfb/kcm_krfb/Makefile.in	2005-03-05 23:23:50.332974184 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_krfb_la_SOURCES)
- DIST_SOURCES = $(kcm_krfb_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/krfb/kcm_krfb/Makefile.in kdenetwork-3.4.1/krfb/kcm_krfb/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/kcm_krfb/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/krfb/kcm_krfb/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30717,44 +17355,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/krfb/kinetd/Makefile.in kdenetwork-3.4.0/krfb/kinetd/Makefile.in
---- kdenetwork-3.4.0.orig/krfb/kinetd/Makefile.in	2005-03-04 12:37:23.000000000 +0000
-+++ kdenetwork-3.4.0/krfb/kinetd/Makefile.in	2005-03-05 23:23:50.346972056 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kded_kinetd_la_SOURCES)
- DIST_SOURCES = $(kded_kinetd_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/krfb/kinetd/Makefile.in kdenetwork-3.4.1/krfb/kinetd/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/kinetd/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/krfb/kinetd/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30786,44 +17389,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/krfb/krfb/Makefile.in kdenetwork-3.4.0/krfb/krfb/Makefile.in
---- kdenetwork-3.4.0.orig/krfb/krfb/Makefile.in	2005-03-04 12:37:24.000000000 +0000
-+++ kdenetwork-3.4.0/krfb/krfb/Makefile.in	2005-03-05 23:23:50.375967648 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -93,18 +93,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkrfbconfig_la_SOURCES) $(krfb_SOURCES)
- DIST_SOURCES = $(libkrfbconfig_la_SOURCES) $(krfb_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/krfb/krfb/Makefile.in kdenetwork-3.4.1/krfb/krfb/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/krfb/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/krfb/krfb/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -261,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30855,21 +17423,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/krfb/krfb_httpd/Makefile.in kdenetwork-3.4.0/krfb/krfb_httpd/Makefile.in
---- kdenetwork-3.4.0.orig/krfb/krfb_httpd/Makefile.in	2005-03-04 12:37:24.000000000 +0000
-+++ kdenetwork-3.4.0/krfb/krfb_httpd/Makefile.in	2005-03-05 23:23:50.382966584 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/krfb/krfb_httpd/Makefile.in kdenetwork-3.4.1/krfb/krfb_httpd/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/krfb_httpd/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/krfb/krfb_httpd/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -201,6 +201,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30901,35 +17457,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/krfb/libvncserver/Makefile.in kdenetwork-3.4.0/krfb/libvncserver/Makefile.in
---- kdenetwork-3.4.0.orig/krfb/libvncserver/Makefile.in	2005-03-04 12:37:24.000000000 +0000
-+++ kdenetwork-3.4.0/krfb/libvncserver/Makefile.in	2005-03-05 23:23:50.392965064 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -71,11 +71,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libvncserver_la_SOURCES)
- DIST_SOURCES = $(libvncserver_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/krfb/libvncserver/Makefile.in kdenetwork-3.4.1/krfb/libvncserver/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/libvncserver/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/krfb/libvncserver/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -220,6 +220,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -30961,45 +17491,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/krfb/srvloc/Makefile.in kdenetwork-3.4.0/krfb/srvloc/Makefile.in
---- kdenetwork-3.4.0.orig/krfb/srvloc/Makefile.in	2005-03-04 12:37:24.000000000 +0000
-+++ kdenetwork-3.4.0/krfb/srvloc/Makefile.in	2005-03-05 23:23:50.404963240 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libsrvloc_la_SOURCES)
- DIST_SOURCES = $(libsrvloc_la_SOURCES)
-@@ -230,6 +230,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/krfb/Makefile.in kdenetwork-3.4.1/krfb/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/krfb/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -205,6 +205,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31009,16 +17504,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -402,7 +405,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -440,9 +443,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31029,46 +17524,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/ksirc/KSOpenkSirc/Makefile.in kdenetwork-3.4.0/ksirc/KSOpenkSirc/Makefile.in
---- kdenetwork-3.4.0.orig/ksirc/KSOpenkSirc/Makefile.in	2005-03-04 12:37:24.000000000 +0000
-+++ kdenetwork-3.4.0/ksirc/KSOpenkSirc/Makefile.in	2005-03-05 23:23:50.418961112 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -72,18 +72,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksopenksirc_la_SOURCES)
- DIST_SOURCES = $(libksopenksirc_la_SOURCES)
-@@ -238,6 +238,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/krfb/srvloc/Makefile.in kdenetwork-3.4.1/krfb/srvloc/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/srvloc/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/krfb/srvloc/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -230,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31078,7 +17538,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -440,7 +443,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31087,7 +17547,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31099,45 +17559,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/ksirc/KSPrefs/Makefile.in kdenetwork-3.4.0/ksirc/KSPrefs/Makefile.in
---- kdenetwork-3.4.0.orig/ksirc/KSPrefs/Makefile.in	2005-03-04 12:37:25.000000000 +0000
-+++ kdenetwork-3.4.0/ksirc/KSPrefs/Makefile.in	2005-03-05 23:23:50.439957920 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksprefs_la_SOURCES)
- DIST_SOURCES = $(libksprefs_la_SOURCES)
-@@ -232,6 +232,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/ksirc/icons/Makefile.in kdenetwork-3.4.1/ksirc/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/icons/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ksirc/icons/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31147,16 +17572,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -492,7 +495,7 @@
+@@ -384,7 +387,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -530,9 +533,9 @@
+@@ -422,9 +425,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31167,46 +17592,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/ksirc/KSProgress/Makefile.in kdenetwork-3.4.0/ksirc/KSProgress/Makefile.in
---- kdenetwork-3.4.0.orig/ksirc/KSProgress/Makefile.in	2005-03-04 12:37:25.000000000 +0000
-+++ kdenetwork-3.4.0/ksirc/KSProgress/Makefile.in	2005-03-05 23:23:50.449956400 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -69,18 +69,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksprogress_la_SOURCES)
- DIST_SOURCES = $(libksprogress_la_SOURCES)
-@@ -226,6 +226,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/ksirc/img/emoticons/Makefile.in kdenetwork-3.4.1/ksirc/img/emoticons/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/img/emoticons/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ksirc/img/emoticons/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31216,16 +17606,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -424,7 +427,7 @@
+@@ -394,7 +397,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -462,9 +465,9 @@
+@@ -432,9 +435,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31236,46 +17626,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/ksirc/KSTicker/Makefile.in kdenetwork-3.4.0/ksirc/KSTicker/Makefile.in
---- kdenetwork-3.4.0.orig/ksirc/KSTicker/Makefile.in	2005-03-04 12:37:25.000000000 +0000
-+++ kdenetwork-3.4.0/ksirc/KSTicker/Makefile.in	2005-03-05 23:23:50.466953816 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libksticker_la_SOURCES) $(ksttest_SOURCES)
- DIST_SOURCES = $(libksticker_la_SOURCES) $(ksttest_SOURCES)
-@@ -236,6 +236,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/ksirc/img/Makefile.in kdenetwork-3.4.1/ksirc/img/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/img/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ksirc/img/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31285,16 +17640,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,7 +443,7 @@
+@@ -423,7 +426,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -478,9 +481,9 @@
+@@ -461,9 +464,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31305,59 +17660,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/ksirc/Makefile.in kdenetwork-3.4.0/ksirc/Makefile.in
---- kdenetwork-3.4.0.orig/ksirc/Makefile.in	2005-03-04 12:37:27.000000000 +0000
-+++ kdenetwork-3.4.0/ksirc/Makefile.in	2005-03-05 23:23:50.653925392 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -125,29 +125,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) $(getdate_SOURCES) \
- 	$(testview_SOURCES)
-@@ -316,6 +316,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/ksirc/KSOpenkSirc/Makefile.in kdenetwork-3.4.1/ksirc/KSOpenkSirc/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/KSOpenkSirc/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/ksirc/KSOpenkSirc/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31367,16 +17674,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -675,7 +678,7 @@
+@@ -460,7 +463,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .c .cpp .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -713,9 +716,9 @@
+@@ -498,9 +501,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31386,72 +17693,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -1002,7 +1005,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1014,7 +1023,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -1022,7 +1031,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -1043,7 +1058,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/ksirc/icons/Makefile.in kdenetwork-3.4.0/ksirc/icons/Makefile.in
---- kdenetwork-3.4.0.orig/ksirc/icons/Makefile.in	2005-03-04 12:37:27.000000000 +0000
-+++ kdenetwork-3.4.0/ksirc/icons/Makefile.in	2005-03-05 23:23:50.662924024 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -188,6 +188,9 @@
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/ksirc/KSPrefs/Makefile.in kdenetwork-3.4.1/ksirc/KSPrefs/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/KSPrefs/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/ksirc/KSPrefs/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -232,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31461,16 +17708,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -384,7 +387,7 @@
- all: docs-am  all-am
+@@ -492,7 +495,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -422,9 +425,9 @@
+@@ -530,9 +533,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31481,23 +17728,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/ksirc/img/Makefile.in kdenetwork-3.4.0/ksirc/img/Makefile.in
---- kdenetwork-3.4.0.orig/ksirc/img/Makefile.in	2005-03-04 12:37:27.000000000 +0000
-+++ kdenetwork-3.4.0/ksirc/img/Makefile.in	2005-03-05 23:23:50.670922808 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -214,6 +214,9 @@
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/ksirc/KSProgress/Makefile.in kdenetwork-3.4.1/ksirc/KSProgress/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/KSProgress/Makefile.in	2005-05-23 18:09:07.000000000 +0200
++++ kdenetwork-3.4.1/ksirc/KSProgress/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31507,16 +17742,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -423,7 +426,7 @@
- all: docs-am  all-recursive
+@@ -424,7 +427,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -461,9 +464,9 @@
+@@ -462,9 +465,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31527,71 +17762,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
-@@ -500,7 +503,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -512,7 +521,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -520,7 +529,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -541,7 +556,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/ksirc/img/emoticons/Makefile.in kdenetwork-3.4.0/ksirc/img/emoticons/Makefile.in
---- kdenetwork-3.4.0.orig/ksirc/img/emoticons/Makefile.in	2005-03-04 12:37:27.000000000 +0000
-+++ kdenetwork-3.4.0/ksirc/img/emoticons/Makefile.in	2005-03-05 23:23:50.677921744 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -198,6 +198,9 @@
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/ksirc/KSTicker/Makefile.in kdenetwork-3.4.1/ksirc/KSTicker/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/KSTicker/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ksirc/KSTicker/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31601,16 +17776,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -394,7 +397,7 @@
- all: docs-am  all-am
+@@ -440,7 +443,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -432,9 +435,9 @@
+@@ -478,9 +481,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31621,46 +17796,11 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/ksirc/puke/Makefile.in kdenetwork-3.4.0/ksirc/puke/Makefile.in
---- kdenetwork-3.4.0.orig/ksirc/puke/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/ksirc/puke/Makefile.in	2005-03-05 23:23:50.714916120 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -76,18 +76,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libpuke_la_SOURCES)
- DIST_SOURCES = $(libpuke_la_SOURCES)
-@@ -242,6 +242,9 @@
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/ksirc/Makefile.in kdenetwork-3.4.1/ksirc/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ksirc/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -316,6 +316,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31670,16 +17810,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
+@@ -675,7 +678,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .c .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -509,9 +512,9 @@
+@@ -713,9 +716,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31689,24 +17829,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/ktalkd/Makefile.in kdenetwork-3.4.0/ktalkd/Makefile.in
---- kdenetwork-3.4.0.orig/ktalkd/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/ktalkd/Makefile.in	2005-03-05 23:23:50.722914904 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -207,6 +207,9 @@
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/ksirc/puke/Makefile.in kdenetwork-3.4.1/ksirc/puke/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/puke/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ksirc/puke/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -242,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31716,16 +17844,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
- all: docs-am  all-recursive
+@@ -471,7 +474,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -509,9 +512,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31736,93 +17864,10 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
-@@ -461,7 +464,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -473,7 +482,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -481,7 +490,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -502,7 +517,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/ktalkd/kcmktalkd/Makefile.in kdenetwork-3.4.0/ktalkd/kcmktalkd/Makefile.in
---- kdenetwork-3.4.0.orig/ktalkd/kcmktalkd/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/ktalkd/kcmktalkd/Makefile.in	2005-03-05 23:23:50.739912320 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -81,18 +81,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_ktalkd_la_SOURCES)
- DIST_SOURCES = $(kcm_ktalkd_la_SOURCES)
+ clean-noinstLTLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/ktalkd/kcmktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/kcmktalkd/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/kcmktalkd/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ktalkd/kcmktalkd/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -239,6 +239,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -31854,58 +17899,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/ktalkd/ktalkd/Makefile.in kdenetwork-3.4.0/ktalkd/ktalkd/Makefile.in
---- kdenetwork-3.4.0.orig/ktalkd/ktalkd/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/ktalkd/ktalkd/Makefile.in	2005-03-05 23:23:50.751910496 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,29 +77,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ktalkd_SOURCES)
- DIST_SOURCES = $(ktalkd_SOURCES)
-@@ -258,6 +258,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/ktalkd/ktalkd/machines/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkd/machines/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/ktalkd/machines/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ktalkd/ktalkd/machines/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -235,6 +235,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31915,16 +17912,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,7 +476,7 @@
+@@ -431,7 +434,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .c .cpp .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -511,9 +514,9 @@
+@@ -469,9 +472,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31934,95 +17931,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-@@ -624,7 +627,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -636,7 +645,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -644,7 +653,13 @@
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -665,7 +680,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/ktalkd/ktalkd/machines/Makefile.in kdenetwork-3.4.0/ktalkd/ktalkd/machines/Makefile.in
---- kdenetwork-3.4.0.orig/ktalkd/ktalkd/machines/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/ktalkd/ktalkd/machines/Makefile.in	2005-03-05 23:23:50.760909128 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libmach_a_SOURCES)
- DIST_SOURCES = $(libmach_a_SOURCES)
-@@ -235,6 +235,9 @@
+ clean-noinstLIBRARIES:
+diff -Nrua kdenetwork-3.4.1.orig/ktalkd/ktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkd/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/ktalkd/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ktalkd/ktalkd/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -258,6 +258,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32032,16 +17946,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -431,7 +434,7 @@
+@@ -473,7 +476,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .c .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -469,9 +472,9 @@
+@@ -511,9 +514,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32051,46 +17965,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLIBRARIES:
-diff -Nrua kdenetwork-3.4.0.orig/ktalkd/ktalkdlg/Makefile.in kdenetwork-3.4.0/ktalkd/ktalkdlg/Makefile.in
---- kdenetwork-3.4.0.orig/ktalkd/ktalkdlg/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/ktalkd/ktalkdlg/Makefile.in	2005-03-05 23:23:50.769907760 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -70,18 +70,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ktalkdlg_SOURCES)
- DIST_SOURCES = $(ktalkdlg_SOURCES)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/ktalkd/ktalkdlg/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkdlg/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/ktalkdlg/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ktalkd/ktalkdlg/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -32122,35 +18001,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/ktalkd/mail.local/Makefile.in kdenetwork-3.4.0/ktalkd/mail.local/Makefile.in
---- kdenetwork-3.4.0.orig/ktalkd/mail.local/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/ktalkd/mail.local/Makefile.in	2005-03-05 23:23:50.778906392 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -70,11 +70,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(mail_local_SOURCES)
- DIST_SOURCES = $(mail_local_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/ktalkd/mail.local/Makefile.in kdenetwork-3.4.1/ktalkd/mail.local/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/mail.local/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ktalkd/mail.local/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -220,6 +220,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -32182,22 +18035,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/lanbrowsing/Makefile.in kdenetwork-3.4.0/lanbrowsing/Makefile.in
---- kdenetwork-3.4.0.orig/lanbrowsing/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/lanbrowsing/Makefile.in	2005-03-05 23:23:50.786905176 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -204,6 +204,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/ktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/ktalkd/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -207,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32207,7 +18048,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,7 +399,7 @@
+@@ -401,7 +404,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -32216,7 +18057,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -434,9 +437,9 @@
+@@ -439,9 +442,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32228,92 +18069,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -456,7 +459,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -468,7 +477,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -476,7 +485,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -497,7 +512,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/lanbrowsing/kcmlisa/Makefile.in kdenetwork-3.4.0/lanbrowsing/kcmlisa/Makefile.in
---- kdenetwork-3.4.0.orig/lanbrowsing/kcmlisa/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/lanbrowsing/kcmlisa/Makefile.in	2005-03-05 23:23:50.809901680 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_lanbrowser_la_SOURCES)
- DIST_SOURCES = $(kcm_lanbrowser_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/lanbrowsing/kcmlisa/Makefile.in kdenetwork-3.4.1/lanbrowsing/kcmlisa/Makefile.in
+--- kdenetwork-3.4.1.orig/lanbrowsing/kcmlisa/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/lanbrowsing/kcmlisa/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -250,6 +250,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -32345,92 +18103,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -595,7 +598,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -607,7 +616,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -615,7 +624,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -636,7 +651,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/lanbrowsing/kio_lan/Makefile.in kdenetwork-3.4.0/lanbrowsing/kio_lan/Makefile.in
---- kdenetwork-3.4.0.orig/lanbrowsing/kio_lan/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/lanbrowsing/kio_lan/Makefile.in	2005-03-05 23:23:50.822899704 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -78,18 +78,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kio_lan_la_SOURCES)
- DIST_SOURCES = $(kio_lan_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/lanbrowsing/kio_lan/Makefile.in kdenetwork-3.4.1/lanbrowsing/kio_lan/Makefile.in
+--- kdenetwork-3.4.1.orig/lanbrowsing/kio_lan/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/lanbrowsing/kio_lan/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -32462,44 +18137,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/lanbrowsing/lisa/Makefile.in kdenetwork-3.4.0/lanbrowsing/lisa/Makefile.in
---- kdenetwork-3.4.0.orig/lanbrowsing/lisa/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/lanbrowsing/lisa/Makefile.in	2005-03-05 23:23:50.833898032 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(lisa_SOURCES) $(reslisa_SOURCES)
- DIST_SOURCES = $(lisa_SOURCES) $(reslisa_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/lanbrowsing/lisa/Makefile.in kdenetwork-3.4.1/lanbrowsing/lisa/Makefile.in
+--- kdenetwork-3.4.1.orig/lanbrowsing/lisa/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/lanbrowsing/lisa/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -253,6 +253,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -32531,45 +18171,10 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/librss/Makefile.in kdenetwork-3.4.0/librss/Makefile.in
---- kdenetwork-3.4.0.orig/librss/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/librss/Makefile.in	2005-03-05 23:23:50.848895752 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -87,18 +87,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(librss_la_SOURCES) $(testlibrss_SOURCES)
- DIST_SOURCES = $(librss_la_SOURCES) $(testlibrss_SOURCES)
-@@ -245,6 +245,9 @@
+diff -Nrua kdenetwork-3.4.1.orig/lanbrowsing/Makefile.in kdenetwork-3.4.1/lanbrowsing/Makefile.in
+--- kdenetwork-3.4.1.orig/lanbrowsing/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/lanbrowsing/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32579,16 +18184,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -454,7 +457,7 @@
+@@ -396,7 +399,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -492,9 +495,9 @@
+@@ -434,9 +437,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32598,47 +18203,12 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/wifi/Makefile.in kdenetwork-3.4.0/wifi/Makefile.in
---- kdenetwork-3.4.0.orig/wifi/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/wifi/Makefile.in	2005-03-05 23:23:50.877891344 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -86,18 +86,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kwifimanager_SOURCES)
- DIST_SOURCES = $(kwifimanager_SOURCES)
-@@ -266,6 +266,9 @@
+ mostlyclean-libtool:
+diff -Nrua kdenetwork-3.4.1.orig/librss/Makefile.in kdenetwork-3.4.1/librss/Makefile.in
+--- kdenetwork-3.4.1.orig/librss/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/librss/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -245,6 +245,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32648,7 +18218,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,7 @@
+@@ -454,7 +457,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32657,7 +18227,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -545,9 +548,9 @@
+@@ -492,9 +495,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32667,94 +18237,66 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -671,7 +674,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -683,7 +692,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -691,7 +700,13 @@
+diff -Nrua kdenetwork-3.4.1.orig/Makefile.in kdenetwork-3.4.1/Makefile.in
+--- kdenetwork-3.4.1.orig/Makefile.in	2005-05-23 18:09:01.000000000 +0200
++++ kdenetwork-3.4.1/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -221,6 +221,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -421,7 +424,7 @@
+ .SUFFIXES:
+ am--refresh:
+ 	@:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -463,12 +466,12 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -712,7 +727,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdenetwork-3.4.0.orig/wifi/kcmwifi/Makefile.in kdenetwork-3.4.0/wifi/kcmwifi/Makefile.in
---- kdenetwork-3.4.0.orig/wifi/kcmwifi/Makefile.in	2005-03-04 12:37:28.000000000 +0000
-+++ kdenetwork-3.4.0/wifi/kcmwifi/Makefile.in	2005-03-05 23:23:50.892889064 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ #>- 	cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ 	cd $(srcdir) && rm -f configure
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
+ config.h: stamp-h1
+@@ -480,7 +483,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in:  $(am__configure_deps) 
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+ 	rm -f stamp-h1
+ 	touch $@
+@@ -897,7 +900,7 @@
+ .NOEXPORT:
+ 
  #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in 
+ 
  #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kcm_wifi_la_SOURCES)
- DIST_SOURCES = $(kcm_wifi_la_SOURCES)
+ docs-am:
+diff -Nrua kdenetwork-3.4.1.orig/wifi/kcmwifi/Makefile.in kdenetwork-3.4.1/wifi/kcmwifi/Makefile.in
+--- kdenetwork-3.4.1.orig/wifi/kcmwifi/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/wifi/kcmwifi/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -32786,44 +18328,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/wifi/kwireless/Makefile.in kdenetwork-3.4.0/wifi/kwireless/Makefile.in
---- kdenetwork-3.4.0.orig/wifi/kwireless/Makefile.in	2005-03-04 12:37:29.000000000 +0000
-+++ kdenetwork-3.4.0/wifi/kwireless/Makefile.in	2005-03-05 23:23:50.908886632 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libkwireless_la_SOURCES)
- DIST_SOURCES = $(libkwireless_la_SOURCES)
+diff -Nrua kdenetwork-3.4.1.orig/wifi/kwireless/Makefile.in kdenetwork-3.4.1/wifi/kwireless/Makefile.in
+--- kdenetwork-3.4.1.orig/wifi/kwireless/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/wifi/kwireless/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -32855,21 +18362,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.0.orig/wifi/locations/Makefile.in kdenetwork-3.4.0/wifi/locations/Makefile.in
---- kdenetwork-3.4.0.orig/wifi/locations/Makefile.in	2005-03-04 12:37:29.000000000 +0000
-+++ kdenetwork-3.4.0/wifi/locations/Makefile.in	2005-03-05 23:23:50.914885720 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -Nrua kdenetwork-3.4.1.orig/wifi/locations/Makefile.in kdenetwork-3.4.1/wifi/locations/Makefile.in
+--- kdenetwork-3.4.1.orig/wifi/locations/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/wifi/locations/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -32901,21 +18396,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.0.orig/wifi/pixmaps/Makefile.in kdenetwork-3.4.0/wifi/pixmaps/Makefile.in
---- kdenetwork-3.4.0.orig/wifi/pixmaps/Makefile.in	2005-03-04 12:37:29.000000000 +0000
-+++ kdenetwork-3.4.0/wifi/pixmaps/Makefile.in	2005-03-05 23:23:50.920884808 +0000
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $ 
- # @configure_input@
+diff -Nrua kdenetwork-3.4.1.orig/wifi/Makefile.in kdenetwork-3.4.1/wifi/Makefile.in
+--- kdenetwork-3.4.1.orig/wifi/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/wifi/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -266,6 +266,9 @@
+ LIB_XSS = @LIB_XSS@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -507,7 +510,7 @@
  
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -545,9 +548,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+diff -Nrua kdenetwork-3.4.1.orig/wifi/pixmaps/Makefile.in kdenetwork-3.4.1/wifi/pixmaps/Makefile.in
+--- kdenetwork-3.4.1.orig/wifi/pixmaps/Makefile.in	2005-05-23 18:09:08.000000000 +0200
++++ kdenetwork-3.4.1/wifi/pixmaps/Makefile.in	2005-05-24 17:07:10.000000000 +0200
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@