rev 3925 - trunk/packages/kdebase/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Fri Jun 9 14:32:47 UTC 2006


Author: chrsmrtn
Date: 2006-06-09 14:30:43 +0000 (Fri, 09 Jun 2006)
New Revision: 3925

Modified:
   trunk/packages/kdebase/debian/patches/98_buildprep.diff
Log:
buildprep update.


Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/98_buildprep.diff	2006-06-09 14:16:08 UTC (rev 3924)
+++ trunk/packages/kdebase/debian/patches/98_buildprep.diff	2006-06-09 14:30:43 UTC (rev 3925)
@@ -3835,6 +3835,44 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+--- aclocal.m4
++++ aclocal.m4
+@@ -501,6 +501,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+ 
++# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes.	            -*- Autoconf -*-
+ 
+ # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 --- applnk/compat/Makefile.in
 +++ applnk/compat/Makefile.in
 @@ -119,6 +119,7 @@
@@ -3845,7 +3883,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -263,6 +264,9 @@
+@@ -213,7 +214,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3855,7 +3901,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -313,6 +317,7 @@
+@@ -313,6 +316,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -3863,7 +3909,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -320,12 +325,9 @@
+@@ -320,12 +324,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -3876,7 +3922,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -346,10 +348,13 @@
+@@ -346,10 +347,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -3890,7 +3936,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -358,6 +363,7 @@
+@@ -358,6 +362,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -3898,7 +3944,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -519,6 +525,7 @@
+@@ -519,6 +524,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -3906,7 +3952,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -526,10 +533,12 @@
+@@ -526,10 +532,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -3919,7 +3965,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -560,7 +568,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -3928,7 +3974,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -598,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3940,6 +3986,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -760,7 +768,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=kcmkxmlrpcd.desktop bwarning.desktop virtualdesktops.desktop cwarning.desktop battery.desktop socks.desktop Makefile.in kcmkonq.desktop passwords.desktop email.desktop konqhtml.desktop userinfo.desktop Makefile.am power.desktop 
++KDE_DIST=kcmkxmlrpcd.desktop bwarning.desktop virtualdesktops.desktop cwarning.desktop battery.desktop socks.desktop Makefile.in kcmkonq.desktop passwords.desktop email.desktop konqhtml.desktop userinfo.desktop power.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
 --- applnk/Makefile.in
 +++ applnk/Makefile.in
 @@ -136,6 +136,7 @@
@@ -3950,7 +4005,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -280,6 +281,9 @@
+@@ -230,7 +231,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3960,7 +4023,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -330,6 +334,7 @@
+@@ -330,6 +333,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -3968,7 +4031,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -337,12 +342,9 @@
+@@ -337,12 +341,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -3981,7 +4044,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -363,10 +365,13 @@
+@@ -363,10 +364,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -3995,7 +4058,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -375,6 +380,7 @@
+@@ -375,6 +379,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -4003,7 +4066,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -536,6 +542,7 @@
+@@ -536,6 +541,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -4011,7 +4074,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -543,10 +550,12 @@
+@@ -543,10 +549,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -4024,7 +4087,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -569,7 +578,7 @@
+@@ -569,7 +577,7 @@
  SUBDIRS = compat
  xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
  xdg_mergedmenu_DATA = kde-essential.menu
@@ -4033,7 +4096,7 @@
  xdg_directory_DATA = \
  kde-main.directory \
  kde-development.directory \
-@@ -624,7 +633,7 @@
+@@ -624,7 +632,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -4042,7 +4105,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -662,9 +671,9 @@
+@@ -662,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -4054,12 +4117,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -1027,7 +1036,7 @@
+@@ -1027,7 +1035,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-utilities-file.directory kde-games-arcade.directory kde-games.directory kde-settings-accessibility.directory kde-settings-security.directory kde-utilities-accessibility.directory kde-settings-network.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-toys.directory kde-system-screensavers.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-games-card.directory kde-development.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory kde-utilities-desktop.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory hidden.directory kde-graphics.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-science.directory kde-settings.directory kde-utilities-peripherals.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory Makefile.am kde-multimedia.directory kde-games-strategy.directory kde-settings-peripherals.directory 
-+KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-games.directory kde-utilities-file.directory kde-games-arcade.directory kde-settings-accessibility.directory kde-settings-network.directory kde-utilities-accessibility.directory kde-settings-security.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-system-screensavers.directory kde-toys.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-office.directory kde-information.menu kde-games-card.directory kde-development.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory kde-utilities-desktop.directory Makefile.in kde-settings-system.directory kde-settings-hardware.directory kde-graphics.directory hidden.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-science.directory kde-settings.directory kde-utilities-peripherals.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory Makefile.am kde-multimedia.directory kde-games-strategy.directory kde-settings-peripherals.directory 
++KDE_DIST=kde-settings-sound.directory kde-settings-desktop.directory kde-games.directory kde-utilities-file.directory kde-games-arcade.directory kde-settings-accessibility.directory kde-settings-network.directory kde-utilities-accessibility.directory kde-settings-security.directory kde-settings-components.directory kde-settingsmenu.directory kde-internet.directory kde-settings-power.directory kde-development-webdevelopment.directory kde-system-screensavers.directory kde-toys.directory kde-internet-terminal.directory kde-essential.menu kde-games-board.directory kde-information.menu kde-office.directory kde-development.directory kde-games-card.directory kde-settings.menu kde-main.directory kde-information.directory old_desktop_files kde-games-kidsgames.directory kde-utilities-desktop.directory Makefile.in kde-settings-hardware.directory kde-settings-system.directory kde-graphics.directory hidden.directory kde-development-translation.directory kde-utilities.directory kde-games-roguelikes.directory kde-editors.directory kde-more.directory kde-system.directory kde-system-terminal.directory kde-edutainment.directory kde-settings-webbrowsing.directory kde-utilities-peripherals.directory kde-settings.directory kde-science.directory kde-utilities-xutils.directory kde-settings-looknfeel.directory kde-unknown.directory kde-screensavers.menu kde-utilities-pim.directory kde-multimedia.directory Makefile.am kde-games-strategy.directory kde-settings-peripherals.directory 
  
  #>+ 2
  docs-am:
@@ -4082,7 +4145,27 @@
  /* Define if you have long long as datatype */
  #undef HAVE_LONG_LONG
  
-@@ -662,25 +666,25 @@
+@@ -503,9 +507,6 @@
+ /* Define if you have the usleep prototype */
+ #undef HAVE_USLEEP_PROTO
+ 
+-/* Define if you have the utempter helper for utmp managment */
+-#undef HAVE_UTEMPTER
+-
+ /* Define to 1 if you have the <util.h> header file. */
+ #undef HAVE_UTIL_H
+ 
+@@ -524,9 +525,6 @@
+ /* Define to 1 if you have the `waitpid' function. */
+ #undef HAVE_WAITPID
+ 
+-/* Define if the using keyword works correctly */
+-#undef HAVE_WORKING_USING
+-
+ /* Define to 1 if you have the <X11/extensions/Xcomposite.h> header file. */
+ #undef HAVE_X11_EXTENSIONS_XCOMPOSITE_H
+ 
+@@ -662,25 +660,25 @@
  /* Define if kdm should use Sun's secure RPC for Xauth cookies. */
  #undef SECURE_RPC
  
@@ -4121,7 +4204,7 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.59d.
++# Generated by GNU Autoconf 2.59e.
  #
 -# Copyright (C) 2003 Free Software Foundation, Inc.
 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -4662,7 +4745,7 @@
 -' ECHO_T='	' ;;
 -  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
 -  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (dirname -- /) >/dev/null 2>&1; then
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 +  as_dirname=dirname
 +else
 +  as_dirname=false
@@ -4811,7 +4894,7 @@
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -455,17 +745,526 @@
+@@ -455,17 +745,525 @@
  #endif
  #if HAVE_INTTYPES_H
  # include <inttypes.h>
@@ -5087,7 +5170,6 @@
 +LIBCFG
 +LIBODM
 +LIBCURSES
-+LIBUTEMPTER
 +LIBKSTAT
 +LIBDEVINFO
 +JAVAC
@@ -5343,7 +5425,7 @@
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -492,34 +1291,48 @@
+@@ -492,34 +1290,48 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -5399,7 +5481,7 @@
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -541,12 +1354,18 @@
+@@ -541,12 +1353,18 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -5421,7 +5503,7 @@
    -disable-* | --disable-*)
      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
-@@ -554,7 +1373,17 @@
+@@ -554,7 +1372,17 @@
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -5440,7 +5522,7 @@
  
    -enable-* | --enable-*)
      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -563,11 +1392,7 @@
+@@ -563,11 +1391,7 @@
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -5453,7 +5535,7 @@
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -594,6 +1419,12 @@
+@@ -594,6 +1418,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -5466,7 +5548,7 @@
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -618,13 +1449,16 @@
+@@ -618,13 +1448,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -5487,7 +5569,7 @@
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -689,6 +1523,16 @@
+@@ -689,6 +1522,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -5504,7 +5586,7 @@
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -745,11 +1589,7 @@
+@@ -745,11 +1588,7 @@
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package| sed 's/-/_/g'`
@@ -5517,7 +5599,7 @@
  
    -without-* | --without-*)
      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -758,7 +1598,7 @@
+@@ -758,7 +1597,7 @@
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package | sed 's/-/_/g'`
@@ -5526,7 +5608,7 @@
  
    --x)
      # Obsolete; use --with-x.
-@@ -789,8 +1629,7 @@
+@@ -789,8 +1628,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -5536,7 +5618,7 @@
      export $ac_envvar ;;
  
    *)
-@@ -810,27 +1649,19 @@
+@@ -810,27 +1648,19 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -5574,7 +5656,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -857,94 +1688,76 @@
+@@ -857,94 +1687,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -5726,7 +5808,7 @@
  
  #
  # Report the --help message.
-@@ -973,9 +1786,6 @@
+@@ -973,9 +1785,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -5736,7 +5818,7 @@
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -993,15 +1803,22 @@
+@@ -993,15 +1802,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -5762,7 +5844,7 @@
  _ACEOF
  
    cat <<\_ACEOF
-@@ -1025,6 +1842,8 @@
+@@ -1025,6 +1841,8 @@
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -5771,7 +5853,7 @@
    --disable-fast-perl     disable fast Makefile generation (needs perl)
    --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
    --disable-debug         disables debug output and debug symbols default=no
-@@ -1042,10 +1861,8 @@
+@@ -1042,10 +1860,8 @@
                            of memory)
    --enable-closure        delay template instantiation
    --enable-nmcheck        enable automatic namespace cleanness check
@@ -5784,7 +5866,7 @@
    --enable-libsuffix      /lib directory suffix (64,32,none,auto=default)
    --enable-fast-install[=PKGS]
                            optimize for fast installation [default=yes]
-@@ -1071,8 +1888,7 @@
+@@ -1071,8 +1887,7 @@
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
@@ -5794,7 +5876,7 @@
    --with-extra-includes=DIR
                            adds non standard include paths
    --with-extra-libs=DIR   adds non standard library paths
-@@ -1080,11 +1896,12 @@
+@@ -1080,11 +1895,12 @@
    --with-qt-includes=DIR  where the Qt includes are.
    --with-qt-libraries=DIR where the Qt library is installed.
    --without-arts          build without aRts default=no
@@ -5811,7 +5893,7 @@
    --with-java=javadir     use java installed in javadir, --without-java
                            disables
    --without-composite     Disable Xcomposite support (default: check)
-@@ -1118,131 +1935,100 @@
+@@ -1118,131 +1934,100 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -5966,7 +6048,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
 +configure
-+generated by GNU Autoconf 2.59d
++generated by GNU Autoconf 2.59e
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -5985,7 +6067,7 @@
  
  It was created by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.59d.  Invocation command line was
++generated by GNU Autoconf 2.59e.  Invocation command line was
  
    $ $0 $@
  
@@ -5994,7 +6076,7 @@
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1261,7 +2047,7 @@
+@@ -1261,7 +2046,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -6003,7 +6085,7 @@
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1275,6 +2061,7 @@
+@@ -1275,6 +2060,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -6011,7 +6093,15 @@
  
  } >&5
  
-@@ -1307,7 +2094,7 @@
+@@ -1296,7 +2082,6 @@
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+-ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+@@ -1307,7 +2092,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -6020,7 +6110,18 @@
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1342,8 +2129,8 @@
+@@ -1329,9 +2114,7 @@
+ 	  -* ) ac_must_keep_next=true ;;
+ 	esac
+       fi
+-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+-      # Get rid of the leading space.
+-      ac_sep=" "
++      ac_configure_args="$ac_configure_args '$ac_arg'"
+       ;;
+     esac
+   done
+@@ -1342,8 +2125,8 @@
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -6031,7 +6132,7 @@
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1356,20 +2143,34 @@
+@@ -1356,20 +2139,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -6076,13 +6177,16 @@
      echo
  
      cat <<\_ASBOX
-@@ -1380,22 +2181,22 @@
+@@ -1380,22 +2177,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
 -      eval ac_val=$`echo $ac_var`
 -      echo "$ac_var='"'"'$ac_val'"'"'"
 +      eval ac_val=\$$ac_var
++      case $ac_val in
++      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++      esac
 +      echo "$ac_var='\''$ac_val'\''"
      done | sort
      echo
@@ -6102,11 +6206,14 @@
 -	eval ac_val=$`echo $ac_var`
 -	echo "$ac_var='"'"'$ac_val'"'"'"
 +	eval ac_val=\$$ac_var
++	case $ac_val in
++	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++	esac
 +	echo "$ac_var='\''$ac_val'\''"
        done | sort
        echo
      fi
-@@ -1407,26 +2208,24 @@
+@@ -1407,26 +2210,24 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -6138,7 +6245,7 @@
  
  # Predefined preprocessor variables.
  
-@@ -1457,14 +2256,17 @@
+@@ -1457,14 +2258,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -6163,7 +6270,7 @@
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1480,8 +2282,8 @@
+@@ -1480,8 +2284,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -6174,7 +6281,7 @@
      esac
    fi
  else
-@@ -1493,12 +2295,11 @@
+@@ -1493,12 +2297,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -6190,7 +6297,7 @@
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1523,8 +2324,7 @@
+@@ -1523,8 +2326,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -6200,7 +6307,7 @@
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1541,12 +2341,6 @@
+@@ -1541,12 +2343,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -6213,7 +6320,7 @@
  
  
  
-@@ -1563,110 +2357,165 @@
+@@ -1563,110 +2359,165 @@
  
  
  
@@ -6431,7 +6538,7 @@
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1676,17 +2525,17 @@
+@@ -1676,17 +2527,17 @@
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
  test "$program_prefix" != NONE &&
@@ -6452,7 +6559,7 @@
  
  
  am__api_version="1.9"
-@@ -1708,8 +2557,8 @@
+@@ -1708,8 +2559,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -6463,7 +6570,7 @@
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1731,7 +2580,7 @@
+@@ -1731,7 +2582,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6472,7 +6579,7 @@
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -1750,21 +2599,22 @@
+@@ -1750,21 +2601,22 @@
      ;;
  esac
  done
@@ -6500,7 +6607,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -1778,8 +2628,8 @@
+@@ -1778,8 +2630,8 @@
    if test -z "$kde_save_INSTALL_given" ; then
      # OK, user hasn't given any INSTALL, autoconf found one for us
      # now we test, if it supports the -p flag
@@ -6511,7 +6618,7 @@
      rm -f confinst.$$.* > /dev/null 2>&1
      echo "Testtest" > confinst.$$.orig
      ac_res=no
-@@ -1791,8 +2641,8 @@
+@@ -1791,8 +2643,8 @@
        fi
      fi
      rm -f confinst.$$.*
@@ -6522,7 +6629,7 @@
    fi
  
    if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1802,8 +2652,8 @@
+@@ -1802,8 +2654,8 @@
      INSTALL_SCRIPT='${INSTALL}'
    fi
  
@@ -6533,7 +6640,7 @@
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -1845,8 +2695,8 @@
+@@ -1845,8 +2697,8 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -6544,7 +6651,7 @@
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
  
-@@ -1897,8 +2747,8 @@
+@@ -1897,8 +2749,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -6555,7 +6662,7 @@
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1911,41 +2761,44 @@
+@@ -1911,54 +2763,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6590,10 +6697,11 @@
  
 -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
 +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
 +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -6601,21 +6709,27 @@
 +SHELL = /bin/sh
  all:
 -	@echo 'ac_maketemp="$(MAKE)"'
-+	@echo 'ac_maketemp=X"$(MAKE)"'
++	@echo '@@@%%%=$(MAKE)=@@@%%%'
  _ACEOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 -if test -n "$ac_maketemp"; then
-+if test "$ac_maketemp" != X ; then
-   eval ac_cv_prog_make_${ac_make}_set=yes
- else
-   eval ac_cv_prog_make_${ac_make}_set=no
-@@ -1953,12 +2806,12 @@
+-  eval ac_cv_prog_make_${ac_make}_set=yes
+-else
+-  eval ac_cv_prog_make_${ac_make}_set=no
+-fi
++case `${MAKE-make} -f conftest.make 2>/dev/null` in
++  *@@@%%%=?*=@@@%%%*)
++    eval ac_cv_prog_make_${ac_make}_set=yes;;
++  *)
++    eval ac_cv_prog_make_${ac_make}_set=no;;
++esac
  rm -f conftest.make
  fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
 -  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
    SET_MAKE=
@@ -6627,7 +6741,7 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -2029,8 +2882,8 @@
+@@ -2029,8 +2884,8 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -6638,7 +6752,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2043,32 +2896,34 @@
+@@ -2043,32 +2898,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6680,7 +6794,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2081,27 +2936,41 @@
+@@ -2081,27 +2938,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6729,7 +6843,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -2121,6 +2990,31 @@
+@@ -2121,6 +2992,31 @@
  
  
  
@@ -6761,7 +6875,7 @@
  
    unset CDPATH
  
-@@ -2139,14 +3033,14 @@
+@@ -2139,14 +3035,14 @@
  
    if test "x$prefix" = "xNONE"; then
  
@@ -6779,7 +6893,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -2189,8 +3083,8 @@
+@@ -2189,8 +3085,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6790,7 +6904,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
  Please check whether you installed KDE correctly.
-@@ -2201,8 +3095,8 @@
+@@ -2201,8 +3097,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -6801,7 +6915,7 @@
        KDECONFIG=$kde_cv_path
  
     fi
-@@ -2211,14 +3105,14 @@
+@@ -2211,14 +3107,14 @@
          kde_save_PATH="$PATH"
      PATH="$exec_prefix/bin:$prefix/bin:$PATH"
  
@@ -6819,7 +6933,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -2261,8 +3155,8 @@
+@@ -2261,8 +3157,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6830,7 +6944,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
  Please check whether you installed KDE correctly.
-@@ -2273,8 +3167,8 @@
+@@ -2273,8 +3169,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -6841,7 +6955,7 @@
        KDECONFIG=$kde_cv_path
  
     fi
-@@ -2297,16 +3191,16 @@
+@@ -2297,16 +3193,16 @@
    kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
    kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
  
@@ -6864,7 +6978,7 @@
    fi
  
    # And delete superfluous '/' to make compares easier
-@@ -2319,13 +3213,13 @@
+@@ -2319,13 +3215,13 @@
  
  
  
@@ -6882,7 +6996,7 @@
  
  
    val=
-@@ -2342,11 +3236,11 @@
+@@ -2342,11 +3238,11 @@
  
  
  
@@ -6896,7 +7010,7 @@
  
  
  am_make=${MAKE-make}
-@@ -2356,8 +3250,8 @@
+@@ -2356,8 +3252,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -6907,7 +7021,7 @@
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2384,15 +3278,15 @@
+@@ -2384,15 +3280,15 @@
  fi
  
  
@@ -6928,7 +7042,7 @@
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2412,10 +3306,9 @@
+@@ -2412,10 +3308,9 @@
  
  
  
@@ -6941,7 +7055,7 @@
      case $enableval in
        yes)
          kde_use_debug_code="yes"
-@@ -2435,18 +3328,18 @@
+@@ -2435,18 +3330,18 @@
    kde_use_debug_code="no"
        kde_use_debug_define=no
  
@@ -6967,7 +7081,7 @@
      if test $enableval = "no"; then
           kde_use_strict_options="no"
         else
-@@ -2455,12 +3348,12 @@
+@@ -2455,12 +3350,12 @@
  
  else
    kde_use_strict_options="no"
@@ -6984,7 +7098,7 @@
      if test $enableval = "no"; then
           kde_use_warnings="no"
         else
-@@ -2469,20 +3362,21 @@
+@@ -2469,20 +3364,21 @@
  
  else
    kde_use_warnings="yes"
@@ -7011,7 +7125,7 @@
  
      CFLAGS=" $CFLAGS"
  
-@@ -2494,8 +3388,8 @@
+@@ -2494,8 +3390,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -7022,7 +7136,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2508,32 +3402,34 @@
+@@ -2508,32 +3404,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7064,7 +7178,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2546,36 +3442,51 @@
+@@ -2546,36 +3444,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7126,7 +7240,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2588,74 +3499,34 @@
+@@ -2588,74 +3501,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7210,7 +7324,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2669,7 +3540,7 @@
+@@ -2669,7 +3542,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7219,7 +7333,7 @@
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2680,6 +3551,7 @@
+@@ -2680,6 +3553,7 @@
    fi
  done
  done
@@ -7227,7 +7341,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2697,22 +3569,23 @@
+@@ -2697,22 +3571,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -7258,7 +7372,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2725,36 +3598,38 @@
+@@ -2725,36 +3600,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7305,7 +7419,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2767,29 +3642,45 @@
+@@ -2767,29 +3644,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7357,7 +7471,7 @@
  fi
  
  fi
-@@ -2802,25 +3693,38 @@
+@@ -2802,21 +3695,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -7367,53 +7481,41 @@
  ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
 -  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
-+  (eval $ac_compiler --version >&5) 2>&5
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler --version >&5") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
 -  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
-+  (eval $ac_compiler -v >&5) 2>&5
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler -v >&5") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
 -  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
-+  (eval $ac_compiler -V >&5) 2>&5
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler -V >&5") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
- 
-+
-+# List of possible output files.  We want to start from the most likely,
-+# but we have to check foo.exe before foo, because Cygwin `test -f' looks
-+# also for foo.exe.  b.out is created by i960 compilers.
-+# As a last resort, we also try wildcards: `conftest.*' and `a.*'.
-+# But we are not allowed to rm a.*, and we do not want always remove
-+# conftest.*, so we will list them literally, when appropriate.
-+ac_outfiles="a_out.exe a.out conftest.exe conftest a.exe b.out"
-+
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions.  Remove them first so a
-+# subsequent execution test works.
-+rm -f $ac_outfiles conftest.*
-+
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -2836,51 +3740,40 @@
-   return 0;
- }
- _ACEOF
-+
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+ac_clean_files="$ac_clean_files $ac_outfiles"
-+
-+# The following tests should remove their output except files matching conftest.*.
+@@ -2841,46 +3748,70 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -7422,9 +7524,34 @@
 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
  ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+-  (eval $ac_link_default) 2>&5
++#
++# List of possible output files, starting from the most likely.
++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
++# only as a last resort.  b.out is created by i960 compilers.
++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
++#
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions.  Remove them first so a
++# subsequent execution test works.
++ac_rmfiles=
++for ac_file in $ac_files
++do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
++  esac
++done
++rm -f $ac_rmfiles
 +
- if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
++if { (ac_try="$ac_link_default"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link_default") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -7437,7 +7564,12 @@
 -ac_cv_exeext=
 -# b.out is created by i960 compilers.
 -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+  for ac_file in $ac_outfiles a.* conftest.* NO
++  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
++# in a Makefile.  We should not override ac_cv_exeext if it was cached,
++# so that the user can short-circuit this test for compilers unknown to
++# Autoconf.
++for ac_file in $ac_files
  do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -7445,47 +7577,47 @@
 -	;;
 -    conftest.$ac_ext )
 -	# This is the source file.
--	;;
--    [ab].out )
--	# We found the default executable, but exeext='' is most
--	# certainly right.
--	break;;
--    *.* )
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ 	;;
+     [ab].out )
+ 	# We found the default executable, but exeext='' is most
+ 	# certainly right.
+ 	break;;
+     *.* )
 -	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 -	# FIXME: I believe we export ac_cv_exeext for Libtool,
 -	# but it would be cool to find out if it's true.  Does anybody
 -	# maintain Libtool? --akim.
 -	export ac_cv_exeext
--	break;;
--    * )
--	break;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+    * ) break;;
++        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++	then :; else
++	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	fi
++	# We set ac_cv_exeext here because the later test for it is not
++	# safe: cross compilers may not add the suffix if given an `-o'
++	# argument, so we may need to know it at that point already.
++	# Even if this section looks crufty: it has the advantage of
++	# actually working.
+ 	break;;
+     * )
+ 	break;;
    esac
  done
-+if test "$ac_file" = NO; then
-+  { { echo "$as_me:$LINENO: error: no output file found
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no output file found
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
++test "$ac_cv_exeext" = no && ac_cv_exeext=
 +
-+
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2892,14 +3785,12 @@
-    { (exit 77); exit 77; }; }
+@@ -2893,19 +3824,23 @@
  fi
  
--ac_exeext=$ac_cv_exeext
+ ac_exeext=$ac_cv_exeext
 -echo "$as_me:$LINENO: result: $ac_file" >&5
 -echo "${ECHO_T}$ac_file" >&6
--
--# Check the compiler produces executables we can run.  If not, either
 +{ echo "$as_me:$LINENO: result: $ac_file" >&5
 +echo "${ECHO_T}$ac_file" >&6; }
+ 
+-# Check the compiler produces executables we can run.  If not, either
 +# Check that the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
 -echo "$as_me:$LINENO: checking whether the C compiler works" >&5
@@ -7495,7 +7627,19 @@
  # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
  # If not cross compiling, check that we can run a simple program.
  if test "$cross_compiling" != yes; then
-@@ -2924,83 +3815,84 @@
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -2924,22 +3859,27 @@
      fi
    fi
  fi
@@ -7504,20 +7648,20 @@
 +{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  
--rm -f a.out a.exe conftest$ac_cv_exeext b.out
--ac_clean_files=$ac_clean_files_save
+ rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
 -# Check the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
++# Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
 -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 -echo "$as_me:$LINENO: result: $cross_compiling" >&5
 -echo "${ECHO_T}$cross_compiling" >&6
-+# Clean up; list also $ac_file, in case it matched a wildcard entry.
-+rm -f $ac_outfiles $ac_file
- 
+-
 -echo "$as_me:$LINENO: checking for suffix of executables" >&5
 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
 +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
@@ -7525,100 +7669,59 @@
 +
 +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if test "${ac_cv_exeext+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
--  # If both `conftest.exe' and `conftest' are `present' (well, observable)
--# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
--# work properly (i.e., refer to `conftest.exe'), while it won't with
--# `rm'.
--for ac_file in conftest.exe conftest conftest.*; do
--  test -f "$ac_file" || continue
--  case $ac_file in
+@@ -2950,9 +3890,8 @@
+ for ac_file in conftest.exe conftest conftest.*; do
+   test -f "$ac_file" || continue
+   case $ac_file in
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
--    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 -	  export ac_cv_exeext
--	  break;;
--    * ) break;;
--  esac
--done
-+  # If both `conftest.exe' and `conftest' are `present' (well, observable),
-+    # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-+    # work properly (i.e., refer to `conftest.exe'), while it won't with `rm'.
-+    for ac_file in conftest.exe conftest conftest.* NO; do
-+      test -f "$ac_file" || continue
-+      case $ac_file in
-+	*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+	*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	      break;;
-+	* ) break;;
-+      esac
-+    done
-+    if test "$ac_file" = NO; then
-+  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: no output file found
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: no output file found
-+See \`config.log' for more details." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+    # Clean up; list also $ac_file, in case it matched conftest.*.
-+    rm -f $ac_outfiles $ac_file
-+
- else
-   { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
-+
+ 	  break;;
+     * ) break;;
+   esac
+@@ -2966,14 +3905,14 @@
  fi
  
--rm -f conftest$ac_cv_exeext
+ rm -f conftest$ac_cv_exeext
 -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 -echo "${ECHO_T}$ac_cv_exeext" >&6
- 
--rm -f conftest.$ac_ext
-+fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 +echo "${ECHO_T}$ac_cv_exeext" >&6; }
+ 
+ rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
 -echo "$as_me:$LINENO: checking for suffix of object files" >&5
 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+
-+
-+ac_clean_files=$ac_clean_files_save
-+
 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.o conftest.obj
-+  rm -f conftest.o conftest.obj
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
+@@ -2993,14 +3932,20 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -7631,11 +7734,9 @@
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -3016,14 +3908,16 @@
-    { (exit 1); exit 1; }; }
- fi
+@@ -3018,12 +3963,12 @@
  
--rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 -echo "${ECHO_T}$ac_cv_objext" >&6
@@ -7645,15 +7746,57 @@
  ac_objext=$OBJEXT
 -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+
-+
-+rm -f conftest.*
 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3072,24 +3966,28 @@
+@@ -3046,24 +3991,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -3072,24 +4029,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7689,7 +7832,52 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3131,97 +4029,23 @@
+@@ -3105,24 +4066,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -3131,285 +4104,273 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7751,7 +7939,7 @@
 -  va_end (v);
 -  return s;
 -}
- 
+-
 -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
 -   function prototypes and stuff, but not '\xHH' hex character constants.
 -   These don't provoke an error unfortunately, instead are silently treated
@@ -7760,9 +7948,6 @@
 -   array size at least.  It's necessary to write '\x00'==0 to get something
 -   that's true only with -std1.  */
 -int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+int
-+main ()
-+{
  
 -int test (int i, double x);
 -struct s1 {int (*f) (int a);};
@@ -7770,10 +7955,11 @@
 -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
 -int argc;
 -char **argv;
--int
--main ()
--{
+ int
+ main ()
+ {
 -return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++
    ;
    return 0;
  }
@@ -7789,13 +7975,47 @@
 -do
 -  CC="$ac_save_CC $ac_arg"
 -  rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
-@@ -3243,81 +4067,24 @@
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_prog_cc_stdc=$ac_arg
 -break
@@ -7881,9 +8101,48 @@
    ;
    return 0;
  }
-@@ -3344,30 +4111,104 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  :
 +  ac_cv_prog_cc_g=yes
@@ -7893,6 +8152,9 @@
  
 -continue
 +
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 +
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -7900,9 +8162,6 @@
 +fi
 +
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_c_werror_flag=$ac_save_c_werror_flag
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -7984,17 +8243,51 @@
  }
  _ACEOF
 -rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 +	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 +do
 +  CC="$ac_save_CC $ac_arg"
 +  rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
-@@ -3389,27 +4230,36 @@
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  break
 +  ac_cv_prog_cc_c89=$ac_arg
@@ -8041,7 +8334,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3418,8 +4268,8 @@
+@@ -3418,8 +4379,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -8052,7 +8345,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3508,8 +4358,8 @@
+@@ -3508,8 +4469,8 @@
  fi
  
  fi
@@ -8063,7 +8356,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3531,8 +4381,8 @@
+@@ -3531,8 +4492,8 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8074,7 +8367,23 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -3592,9 +4442,10 @@
+@@ -3566,8 +4527,13 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -3592,9 +4558,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -8086,7 +8395,23 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3632,6 +4483,7 @@
+@@ -3604,8 +4571,13 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -3632,6 +4604,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -8094,7 +8419,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3649,8 +4501,8 @@
+@@ -3649,8 +4622,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -8105,7 +8430,23 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3699,9 +4551,10 @@
+@@ -3673,8 +4646,13 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -3699,9 +4677,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -8117,7 +8458,23 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3739,6 +4592,7 @@
+@@ -3711,8 +4690,13 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -3739,6 +4723,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -8125,7 +8482,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3789,18 +4643,22 @@
+@@ -3789,18 +4774,22 @@
  
    CXXFLAGS=" $CXXFLAGS"
  
@@ -8153,7 +8510,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3813,36 +4671,38 @@
+@@ -3813,36 +4802,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8200,7 +8557,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3855,55 +4715,70 @@
+@@ -3855,55 +4846,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8262,22 +8619,37 @@
  ac_compiler=`set X $ac_compile; echo $2`
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
 -  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
-+  (eval $ac_compiler --version >&5) 2>&5
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler --version >&5") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
 -  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
-+  (eval $ac_compiler -v >&5) 2>&5
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler -v >&5") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
 -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
 -  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
-+  (eval $ac_compiler -V >&5) 2>&5
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler -V >&5") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
@@ -8289,7 +8661,52 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3952,24 +4827,28 @@
+@@ -3926,24 +4947,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -3952,24 +4985,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8325,7 +8742,52 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4011,47 +4890,18 @@
+@@ -3985,24 +5022,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4011,70 +5060,53 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8377,7 +8839,50 @@
    ;
    return 0;
  }
-@@ -4083,20 +4933,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4083,61 +5115,91 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8403,9 +8908,48 @@
    ;
    return 0;
  }
-@@ -4123,21 +4972,40 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  break
 +  ac_cv_prog_cxx_g=yes
@@ -8416,9 +8960,6 @@
 +
  fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -rm -f conftest*
@@ -8429,6 +8970,9 @@
  fi
  
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -8451,7 +8995,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4146,8 +5014,8 @@
+@@ -4146,8 +5208,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -8462,7 +9006,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4236,8 +5104,8 @@
+@@ -4236,8 +5298,8 @@
  fi
  
  fi
@@ -8473,7 +9017,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -4255,8 +5123,8 @@
+@@ -4255,8 +5317,8 @@
  
  
  
@@ -8484,7 +9028,52 @@
  
  
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4307,13 +5175,14 @@
+@@ -4281,24 +5343,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4307,13 +5381,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8502,7 +9091,7 @@
  
  if test "$kde_bad_compiler" = "yes"; then
    { { echo "$as_me:$LINENO: error:
-@@ -4355,17 +5224,16 @@
+@@ -4355,17 +5430,16 @@
          fi
        fi
  
@@ -8524,7 +9113,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4419,7 +5287,9 @@
+@@ -4393,24 +5467,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4419,7 +5505,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8534,7 +9168,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4433,29 +5303,28 @@
+@@ -4433,29 +5521,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8572,7 +9206,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4508,7 +5377,9 @@
+@@ -4482,24 +5569,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4508,7 +5607,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8582,7 +9261,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4522,13 +5393,13 @@
+@@ -4522,13 +5623,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8600,7 +9279,7 @@
   :
   WOVERLOADED_VRITUAL=""
  fi
-@@ -4549,16 +5420,15 @@
+@@ -4549,16 +5650,15 @@
  
    if test "$kde_use_profiling" = "yes"; then
  
@@ -8621,7 +9300,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4611,7 +5481,9 @@
+@@ -4585,24 +5685,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4611,7 +5723,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8631,7 +9355,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4625,16 +5497,16 @@
+@@ -4625,16 +5739,16 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8652,7 +9376,7 @@
   :
  
  fi
-@@ -4649,16 +5521,15 @@
+@@ -4649,16 +5763,15 @@
              CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
              CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
  
@@ -8673,7 +9397,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4711,7 +5582,9 @@
+@@ -4685,24 +5798,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4711,7 +5836,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8683,7 +9452,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4725,27 +5598,26 @@
+@@ -4725,27 +5852,26 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8718,7 +9487,52 @@
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4796,7 +5668,9 @@
+@@ -4770,24 +5896,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4796,7 +5934,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8728,7 +9542,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
-@@ -4810,13 +5684,13 @@
+@@ -4810,13 +5950,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -8746,7 +9560,7 @@
   :
  
  fi
-@@ -4824,16 +5698,15 @@
+@@ -4824,16 +5964,15 @@
            ;;
          esac
  
@@ -8767,7 +9581,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4886,7 +5759,9 @@
+@@ -4860,24 +5999,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4886,7 +6037,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8777,7 +9636,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4900,28 +5775,27 @@
+@@ -4900,28 +6053,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8814,7 +9673,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4974,7 +5848,9 @@
+@@ -4948,24 +6100,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -4974,7 +6138,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8824,7 +9728,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -4988,28 +5864,27 @@
+@@ -4988,28 +6154,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8861,7 +9765,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5062,7 +5937,9 @@
+@@ -5036,24 +6201,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5062,7 +6239,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8871,7 +9820,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5076,13 +5953,13 @@
+@@ -5076,13 +6255,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8889,7 +9838,7 @@
   :
  
  fi
-@@ -5094,13 +5971,13 @@
+@@ -5094,13 +6273,13 @@
      CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
    fi
  
@@ -8907,7 +9856,7 @@
  
    HAVE_GCC_VISIBILITY=0
  
-@@ -5108,16 +5985,15 @@
+@@ -5108,16 +6287,15 @@
    if test "$GXX" = "yes"; then
      gcc_no_reorder_blocks=NO
  
@@ -8928,7 +9877,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5170,7 +6046,9 @@
+@@ -5144,24 +6322,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5170,7 +6360,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8938,7 +9932,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5184,13 +6062,13 @@
+@@ -5184,13 +6376,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -8956,7 +9950,7 @@
   :
  
  fi
-@@ -5202,16 +6080,15 @@
+@@ -5202,16 +6394,15 @@
            CFLAGS="$CFLAGS -fno-reorder-blocks"
      fi
  
@@ -8977,7 +9971,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5264,7 +6141,9 @@
+@@ -5238,24 +6429,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5264,7 +6467,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8987,7 +10026,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5278,28 +6157,27 @@
+@@ -5278,28 +6483,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9024,7 +10063,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5352,7 +6230,9 @@
+@@ -5326,24 +6530,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5352,7 +6568,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9034,7 +10118,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5366,28 +6246,27 @@
+@@ -5366,28 +6584,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9071,7 +10155,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5440,7 +6319,9 @@
+@@ -5414,24 +6631,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5440,7 +6669,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9081,7 +10210,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5454,28 +6335,27 @@
+@@ -5454,28 +6685,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9118,7 +10247,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5528,7 +6408,9 @@
+@@ -5502,24 +6732,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5528,7 +6770,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9128,7 +10302,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5542,13 +6424,13 @@
+@@ -5542,13 +6786,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9146,7 +10320,7 @@
   :
   USE_EXCEPTIONS=
  fi
-@@ -5556,37 +6438,37 @@
+@@ -5556,37 +6800,37 @@
      ENABLE_PERMISSIVE_FLAG="-fpermissive"
  
      if test "$kde_use_pch" = "yes"; then
@@ -9198,7 +10372,52 @@
  if test "${kde_cv_opt_noinline_match+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5644,9 +6526,10 @@
+@@ -5618,24 +6862,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5644,9 +6900,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9210,7 +10429,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -5654,8 +6537,8 @@
+@@ -5654,8 +6911,8 @@
    fi
  
  fi
@@ -9221,7 +10440,7 @@
  
      if test "x$kde_cv_opt_noinline_match" = "xno" ; then
         CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5675,16 +6558,15 @@
+@@ -5675,16 +6932,15 @@
  
      if test "$kde_use_pch" = "yes"; then
  
@@ -9242,7 +10461,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5737,7 +6619,9 @@
+@@ -5711,24 +6967,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5737,7 +7005,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9252,7 +10516,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5751,29 +6635,28 @@
+@@ -5751,29 +7021,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9290,7 +10554,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5826,7 +6709,9 @@
+@@ -5800,24 +7069,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5826,7 +7107,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9300,7 +10609,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5840,28 +6725,27 @@
+@@ -5840,28 +7123,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9337,7 +10646,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5914,7 +6798,9 @@
+@@ -5888,24 +7170,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -5914,7 +7208,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9347,7 +10701,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -5928,28 +6814,27 @@
+@@ -5928,28 +7224,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9384,7 +10738,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6002,7 +6887,9 @@
+@@ -5976,24 +7271,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6002,7 +7309,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9394,7 +10793,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6016,28 +6903,27 @@
+@@ -6016,28 +7325,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9431,7 +10830,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6090,7 +6976,9 @@
+@@ -6064,24 +7372,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6090,7 +7410,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9441,7 +10885,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6104,28 +6992,27 @@
+@@ -6104,28 +7426,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9478,7 +10922,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6178,7 +7065,9 @@
+@@ -6152,24 +7473,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6178,7 +7511,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9488,7 +10977,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6192,13 +7081,13 @@
+@@ -6192,13 +7527,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9506,7 +10995,7 @@
   :
  
  fi
-@@ -6305,13 +7194,13 @@
+@@ -6305,13 +7640,13 @@
  fi
  
  
@@ -9523,7 +11012,23 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6367,9 +7256,10 @@
+@@ -6341,8 +7676,13 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -6367,9 +7707,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -9535,7 +11040,23 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6407,6 +7297,7 @@
+@@ -6379,8 +7720,13 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -6407,6 +7753,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -9543,7 +11064,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6424,8 +7315,8 @@
+@@ -6424,8 +7771,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -9554,7 +11075,23 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -6474,9 +7365,10 @@
+@@ -6448,8 +7795,13 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -6474,9 +7826,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -9566,7 +11103,23 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6514,6 +7406,7 @@
+@@ -6486,8 +7839,13 @@
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -6514,6 +7872,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -9574,7 +11127,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6540,16 +7433,15 @@
+@@ -6540,16 +7899,15 @@
       NOOPT_CFLAGS=-O0
    fi
  
@@ -9595,7 +11148,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6602,7 +7494,9 @@
+@@ -6576,24 +7934,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6602,7 +7972,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9605,7 +11203,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6616,22 +7510,21 @@
+@@ -6616,22 +7988,21 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9634,7 +11232,7 @@
        if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
          ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
          ac_coverage_linker="-lgcc"
-@@ -6647,36 +7540,36 @@
+@@ -6647,36 +8018,36 @@
        CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
        LDFLAGS="$LDFLAGS $ac_coverage_linker"
  
@@ -9681,7 +11279,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6729,7 +7622,9 @@
+@@ -6703,24 +8074,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6729,7 +8112,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9691,7 +11334,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6743,29 +7638,28 @@
+@@ -6743,29 +8128,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9729,7 +11372,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6818,7 +7712,9 @@
+@@ -6792,24 +8176,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -6818,7 +8214,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9739,7 +11427,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -6832,13 +7728,13 @@
+@@ -6832,13 +8230,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9757,7 +11445,7 @@
   :
  
  fi
-@@ -6848,13 +7744,13 @@
+@@ -6848,13 +8246,13 @@
  
  
  
@@ -9775,7 +11463,7 @@
  
    if test "x$kde_use_final" = "xyes"; then
        KDE_USE_FINAL_TRUE=""
-@@ -6867,13 +7763,13 @@
+@@ -6867,13 +8265,13 @@
  
  
  
@@ -9793,31 +11481,48 @@
  
    KDE_NO_UNDEFINED=""
    if test "x$kde_use_closure" = "xyes"; then
-@@ -6884,198 +7780,19 @@
+@@ -6884,216 +8282,36 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
 -       case $host in
 -         *-*-linux-gnu)
--
++  fi
+ 
 -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
 -echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
 -kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
 -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
++
++
++
++
++  # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
++  kde_use_nmcheck=no
++fi
+ 
+ 
++  if test "$kde_use_nmcheck" = "yes"; then
++      KDE_USE_NMCHECK_TRUE=""
++      KDE_USE_NMCHECK_FALSE="#"
++   else
++      KDE_USE_NMCHECK_TRUE="#"
++      KDE_USE_NMCHECK_FALSE=""
++  fi
+ 
 -   ac_ext=cc
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
+ 
 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
+ 
+ 
 -  save_CXXFLAGS="$CXXFLAGS"
 -  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -9976,30 +11681,33 @@
 -
 -           ;;
 -       esac
-   fi
- 
- 
- 
- 
- 
+-  fi
+-
+-
+-
+-
+-
 -  # Check whether --enable-nmcheck or --disable-nmcheck was given.
-+  # Check whether --enable-nmcheck was given.
- if test "${enable_nmcheck+set}" = set; then
+-if test "${enable_nmcheck+set}" = set; then
 -  enableval="$enable_nmcheck"
 -  kde_use_nmcheck=$enableval
-+  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
- else
-   kde_use_nmcheck=no
+-else
+-  kde_use_nmcheck=no
 -fi;
-+fi
-+
+-
+-  if test "$kde_use_nmcheck" = "yes"; then
+-      KDE_USE_NMCHECK_TRUE=""
+-      KDE_USE_NMCHECK_FALSE="#"
+-   else
+-      KDE_USE_NMCHECK_TRUE="#"
+-      KDE_USE_NMCHECK_FALSE=""
+-  fi
+-
  
-   if test "$kde_use_nmcheck" = "yes"; then
-       KDE_USE_NMCHECK_TRUE=""
-@@ -7090,10 +7807,9 @@
  
- 
- 
+-
+-
+-
 -# Check whether --enable-shared or --disable-shared was given.
 +# Check whether --enable-shared was given.
  if test "${enable_shared+set}" = set; then
@@ -10009,7 +11717,7 @@
      case $enableval in
      yes) enable_shared=yes ;;
      no) enable_shared=no ;;
-@@ -7112,12 +7828,12 @@
+@@ -7112,12 +8330,12 @@
      esac
  else
    enable_shared=yes
@@ -10026,7 +11734,7 @@
      case $enableval in
      yes) enable_static=yes ;;
      no) enable_static=no ;;
-@@ -7136,7 +7852,8 @@
+@@ -7136,7 +8354,8 @@
      esac
  else
    enable_static=no
@@ -10036,7 +11744,7 @@
  
  
  
-@@ -7145,11 +7862,11 @@
+@@ -7145,11 +8364,11 @@
      if test -z "$kdelibsuff"; then
         kdelibsuff="no"
      fi
@@ -10052,7 +11760,7 @@
  
      if test "$kdelibsuff" = "auto"; then
  
-@@ -7170,8 +7887,8 @@
+@@ -7170,8 +8389,8 @@
         kdelibsuff=
      fi
      if test -z "$kdelibsuff"; then
@@ -10063,7 +11771,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define KDELIBSUFF ""
-@@ -7187,14 +7904,13 @@
+@@ -7187,14 +8406,13 @@
  #define KDELIBSUFF "${kdelibsuff}"
  _ACEOF
  
@@ -10082,7 +11790,7 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -7213,10 +7929,11 @@
+@@ -7213,10 +8431,11 @@
      esac
  else
    enable_fast_install=yes
@@ -10097,7 +11805,7 @@
  if test "${lt_cv_path_SED+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7240,7 +7957,7 @@
+@@ -7240,7 +8459,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -10106,7 +11814,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7269,51 +7986,198 @@
+@@ -7269,37 +8488,184 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -10114,10 +11822,7 @@
 -echo "${ECHO_T}$SED" >&6
 +{ echo "$as_me:$LINENO: result: $SED" >&5
 +echo "${ECHO_T}$SED" >&6; }
- 
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
++
 +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
 +if test "${ac_cv_path_GREP+set}" = set; then
@@ -10127,11 +11832,8 @@
 +if test -z "$GREP"; then
 +set dummy grep ggrep; ac_prog_name=$2
 +if test "${ac_cv_path_GREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  ac_path_GREP_found=false
 +# Loop through the user's path and test for each of PROGNAME-LIST
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10164,7 +11866,7 @@
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_GREP="$ac_path_GREP"
 +      ac_path_GREP_max=$ac_count
-     fi
++    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
@@ -10178,8 +11880,11 @@
 +
 +done
 +IFS=$as_save_IFS
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
 +
-+
 +fi
 +
 +GREP="$ac_cv_path_GREP"
@@ -10191,48 +11896,20 @@
 +
 +else
 +  ac_cv_path_GREP=$GREP
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
- 
- 
 +fi
++
++
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
 +
++
 +{ echo "$as_me:$LINENO: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  with_gnu_ld=no
--fi;
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [\\/]* | ?:[\\/]*)
--      re_direlt='/[^/][^/]*/\.\./'
--      # Canonicalize the pathname of ld
--      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++else
 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
 +   then ac_cv_path_EGREP="$GREP -E"
 +   else
@@ -10240,8 +11917,11 @@
 +if test -z "$EGREP"; then
 +set dummy egrep; ac_prog_name=$2
 +if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
 +  ac_path_EGREP_found=false
 +# Loop through the user's path and test for each of PROGNAME-LIST
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -10274,7 +11954,7 @@
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_EGREP="$ac_path_EGREP"
 +      ac_path_EGREP_max=$ac_count
-+    fi
+     fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
@@ -10305,43 +11985,38 @@
 +
 +
 +   fi
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
-+
-+
-+
+ 
+ 
+ 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
 +# Check whether --with-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then
+ if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
 +  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
+ else
+   with_gnu_ld=no
+-fi;
 +fi
 +
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
 +  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [\\/]* | ?:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- 	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-       done
-       test -z "$LD" && LD="$ac_prog"
-@@ -7328,11 +8192,11 @@
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+@@ -7328,11 +8694,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -10357,7 +12032,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7345,7 +8209,7 @@
+@@ -7345,7 +8711,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -10366,7 +12041,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -7365,21 +8229,21 @@
+@@ -7365,21 +8731,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -10395,7 +12070,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7389,29 +8253,38 @@
+@@ -7389,29 +8755,38 @@
    ;;
  esac
  fi
@@ -10442,7 +12117,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7419,56 +8292,63 @@
+@@ -7419,56 +8794,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -10540,7 +12215,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7495,44 +8375,36 @@
+@@ -7495,44 +8877,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -10595,7 +12270,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7548,7 +8420,7 @@
+@@ -7548,7 +8922,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -10604,7 +12279,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7564,43 +8436,27 @@
+@@ -7564,43 +8938,27 @@
    esac
    ;;
  
@@ -10661,7 +12336,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
-@@ -7619,32 +8475,22 @@
+@@ -7619,32 +8977,22 @@
    ;;
  
  openbsd*)
@@ -10697,7 +12372,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7665,17 +8511,20 @@
+@@ -7665,17 +9013,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -10721,7 +12396,7 @@
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7684,14 +8533,17 @@
+@@ -7684,14 +9035,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -10742,16 +12417,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -7718,7 +8570,7 @@
+@@ -7718,7 +9072,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 7721 "configure"' > conftest.$ac_ext
-+  echo '#line 8573 "configure"' > conftest.$ac_ext
++  echo '#line 9075 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7761,14 +8613,13 @@
+@@ -7761,14 +9115,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -10768,7 +12443,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7780,7 +8631,6 @@
+@@ -7780,7 +9133,6 @@
        esac
        ;;
      *64-bit*)
@@ -10776,7 +12451,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7805,8 +8655,8 @@
+@@ -7805,8 +9157,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -10787,7 +12462,52 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7858,8 +8708,9 @@
+@@ -7832,24 +9184,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -7858,8 +9222,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10798,7 +12518,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
-@@ -7869,13 +8720,33 @@
+@@ -7869,13 +9234,33 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -10834,7 +12554,7 @@
  
  esac
  
-@@ -7883,8 +8754,8 @@
+@@ -7883,8 +9268,8 @@
  
  
  
@@ -10845,7 +12565,52 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7934,8 +8805,9 @@
+@@ -7908,24 +9293,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -7934,8 +9331,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10856,7 +12621,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
-@@ -7992,6 +8864,7 @@
+@@ -7992,6 +9390,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -10864,7 +12629,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -8011,8 +8884,8 @@
+@@ -8011,18 +9410,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -10875,7 +12640,30 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -8035,12 +8908,14 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -8035,12 +9443,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -10893,7 +12681,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8063,9 +8938,9 @@
+@@ -8063,9 +9473,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -10906,7 +12694,52 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8105,12 +8980,14 @@
+@@ -8079,24 +9489,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -8105,12 +9527,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10924,7 +12757,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8125,18 +9002,19 @@
+@@ -8125,18 +9549,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -10952,7 +12785,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8173,15 +9051,16 @@
+@@ -8147,24 +9572,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -8173,15 +9610,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10974,7 +12852,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8215,9 +9094,10 @@
+@@ -8190,8 +9628,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -8215,9 +9658,10 @@
  
    ac_header_preproc=no
  fi
@@ -10987,7 +12881,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8241,25 +9121,19 @@
+@@ -8241,25 +9685,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -11020,12 +12914,64 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8271,17 +9145,258 @@
+@@ -8271,219 +9709,538 @@
  
  done
  
-+
-+
+-ac_ext=f
+-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+-  do
+-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_F77+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$F77"; then
+-  ac_cv_prog_F77="$F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+ 
+-fi
+-fi
+-F77=$ac_cv_prog_F77
+-if test -n "$F77"; then
+-  echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+ 
+-    test -n "$F77" && break
+-  done
+-fi
+-if test -z "$F77"; then
+-  ac_ct_F77=$F77
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
 +if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +    (test "X$CXX" != "Xg++"))) ; then
@@ -11038,21 +12984,88 @@
 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 +if test -z "$CXXCPP"; then
 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$ac_ct_F77"; then
+-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
 +      # Double quotes because CXXCPP needs to be expanded
 +    for CXXCPP in "$CXX -E" "/lib/cpp"
 +    do
 +      ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
-+do
+ do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_F77="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_F77=$ac_cv_prog_ac_ct_F77
+-if test -n "$ac_ct_F77"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  test -n "$ac_ct_F77" && break
+-done
+-
+-  F77=$ac_ct_F77
+-fi
+-
+-
+-# Provide some information about the compiler.
+-echo "$as_me:8366:" \
+-     "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
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-rm -f a.out
+-
+-# If we don't use `.F' as extension, the preprocessor is not run on the
+-# input file.  (Note that this only needs to work for GNU compilers.)
+-ac_save_ext=$ac_ext
+-ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
+-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat >conftest.$ac_ext <<_ACEOF
+   cat >conftest.$ac_ext <<_ACEOF
+-      program main
+-#ifndef __GNUC__
+-       choke me
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -11062,16 +13075,41 @@
 +# include <limits.h>
 +#else
 +# include <assert.h>
-+#endif
+ #endif
+-
+-      end
 +		     Syntax error
-+_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_compiler_gnu=yes
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -11084,33 +13122,75 @@
 +fi
 +if test -z "$ac_cpp_err"; then
 +  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
 +  # Broken: fails on valid input.
 +continue
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+ 
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
+-ac_ext=$ac_save_ext
+-ac_test_FFLAGS=${FFLAGS+set}
+-ac_save_FFLAGS=$FFLAGS
+-FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_f77_g+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  FFLAGS=-g
+-cat >conftest.$ac_ext <<_ACEOF
+-      program main
 +rm -f conftest.err conftest.$ac_ext
-+
+ 
+-      end
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_prog_f77_g=yes
 +  (exit $ac_status); } >/dev/null; then
 +  if test -s conftest.err; then
 +    ac_cpp_err=$ac_cxx_preproc_warn_flag
@@ -11174,8 +13254,13 @@
 +#endif
 +		     Syntax error
 +_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
@@ -11213,8 +13298,13 @@
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
-+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 +  ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
@@ -11265,104 +13355,97 @@
 +
 +fi
 +
- ac_ext=f
- ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
- ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_f77_compiler_gnu
- if test -n "$ac_tool_prefix"; then
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
 +  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-   do
-     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8294,36 +9409,38 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++if test "${ac_cv_prog_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$F77"; then
++  ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
 +IFS=$as_save_IFS
- 
- fi
- fi
- F77=$ac_cv_prog_F77
- if test -n "$F77"; then
--  echo "$as_me:$LINENO: result: $F77" >&5
--echo "${ECHO_T}$F77" >&6
++
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
 +  { echo "$as_me:$LINENO: result: $F77" >&5
 +echo "${ECHO_T}$F77" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
- fi
- 
++fi
 +
-     test -n "$F77" && break
-   done
- fi
- if test -z "$F77"; then
-   ac_ct_F77=$F77
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++
++    test -n "$F77" && break
++  done
++fi
++if test -z "$F77"; then
++  ac_ct_F77=$F77
 +  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8336,48 +9453,63 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_F77"; then
++  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_F77="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
++    ac_cv_prog_ac_ct_F77="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
 +IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_F77=$ac_cv_prog_ac_ct_F77
- if test -n "$ac_ct_F77"; then
--  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--echo "${ECHO_T}$ac_ct_F77" >&6
++
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
 +  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
 +echo "${ECHO_T}$ac_ct_F77" >&6; }
- else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
++else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
- fi
- 
++fi
 +
-   test -n "$ac_ct_F77" && break
- done
- 
--  F77=$ac_ct_F77
++
++  test -n "$ac_ct_F77" && break
++done
++
 +  if test "x$ac_ct_F77" = x; then
 +    F77=""
 +  else
@@ -11378,74 +13461,160 @@
 +esac
 +    F77=$ac_ct_F77
 +  fi
- fi
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:8366:" \
--     "checking for Fortran 77 compiler version" >&5
++fi
++
++
++# Provide some information about the compiler.
 +echo "$as_me:$LINENO: 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
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
-+  (eval $ac_compiler --version >&5) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
-+  (eval $ac_compiler -v >&5) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
-+  (eval $ac_compiler -V >&5) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-@@ -8387,8 +9519,8 @@
- # input file.  (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++ac_compiler=`set X $ac_compile; echo $2`
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler --version >&5") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler -v >&5") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler -V >&5") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++rm -f a.out
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.  (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
 +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
- if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8427,20 +9559,21 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_compiler_gnu=no
++if test "${ac_cv_f77_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
++#endif
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
 +	ac_compiler_gnu=no
- fi
++fi
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_f77_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
++
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FFLAGS+set}
- ac_save_FFLAGS=$FFLAGS
- FFLAGS=
--echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_f77_g+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
++if test "${ac_cv_prog_f77_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  FFLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_f77_g=yes
  else
-@@ -8477,13 +9610,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11463,7 +13632,7 @@
  if test "$ac_test_FFLAGS" = set; then
    FFLAGS=$ac_save_FFLAGS
  elif test $ac_cv_prog_f77_g = yes; then
-@@ -8512,13 +9646,13 @@
+@@ -8512,13 +10269,13 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -11480,7 +13649,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8547,20 +9681,70 @@
+@@ -8547,20 +10304,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -11557,7 +13726,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.
-@@ -8571,19 +9755,19 @@
+@@ -8571,19 +10378,19 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -11583,7 +13752,7 @@
  if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8597,9 +9781,6 @@
+@@ -8597,9 +10404,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -11593,7 +13762,7 @@
  # Transform an extracted symbol line into a proper C declaration
  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
  
-@@ -8621,14 +9802,30 @@
+@@ -8621,14 +10425,30 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -11626,7 +13795,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8646,14 +9843,17 @@
+@@ -8646,14 +10466,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -11646,7 +13815,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8771,15 +9971,15 @@
+@@ -8771,15 +10594,15 @@
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -11668,7 +13837,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8793,8 +9993,8 @@
+@@ -8793,8 +10616,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -11679,7 +13848,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -8815,7 +10015,7 @@
+@@ -8815,7 +10638,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -11688,7 +13857,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8835,7 +10035,7 @@
+@@ -8835,7 +10658,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -11697,7 +13866,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8845,8 +10045,8 @@
+@@ -8845,8 +10668,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -11708,7 +13877,7 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8859,32 +10059,34 @@
+@@ -8859,32 +10682,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11750,7 +13919,7 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8897,27 +10099,41 @@
+@@ -8897,27 +10722,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11799,7 +13968,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -8925,8 +10141,8 @@
+@@ -8925,8 +10764,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -11810,7 +13979,7 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8939,32 +10155,34 @@
+@@ -8939,32 +10778,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11852,7 +14021,7 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8977,27 +10195,41 @@
+@@ -8977,27 +10818,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11901,7 +14070,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -9005,8 +10237,8 @@
+@@ -9005,8 +10860,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -11912,7 +14081,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9019,32 +10251,34 @@
+@@ -9019,32 +10874,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11954,7 +14123,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9057,27 +10291,41 @@
+@@ -9057,27 +10914,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12003,7 +14172,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -9092,6 +10340,7 @@
+@@ -9092,6 +10963,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -12011,7 +14180,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9111,21 +10360,32 @@
+@@ -9111,21 +10983,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -12048,7 +14217,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9145,7 +10405,7 @@
+@@ -9145,7 +11028,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -12057,7 +14226,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9177,17 +10437,17 @@
+@@ -9177,17 +11060,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -12081,7 +14250,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9207,7 +10467,7 @@
+@@ -9207,7 +11090,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -12090,7 +14259,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9239,11 +10499,11 @@
+@@ -9239,11 +11122,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -12106,7 +14275,7 @@
  fi
  
    else
-@@ -9258,21 +10518,21 @@
+@@ -9258,21 +11141,21 @@
  enable_dlopen=yes
  enable_win32_dll=no
  
@@ -12135,7 +14304,7 @@
  test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
-@@ -9302,68 +10562,25 @@
+@@ -9302,68 +11185,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -12219,7 +14388,7 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9377,8 +10594,8 @@
+@@ -9377,8 +11217,8 @@
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -12230,7 +14399,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9392,26 +10609,28 @@
+@@ -9392,26 +11232,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -12239,12 +14408,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9398: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10615: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11238: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9402: \$? = $ac_status" >&5
-+   echo "$as_me:10619: \$? = $ac_status" >&5
++   echo "$as_me:11242: \$? = $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
@@ -12266,7 +14435,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9425,8 +10644,8 @@
+@@ -9425,8 +11267,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -12277,7 +14446,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -9464,6 +10683,11 @@
+@@ -9464,6 +11306,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -12289,7 +14458,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9480,7 +10704,7 @@
+@@ -9480,7 +11327,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -12298,7 +14467,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9506,6 +10730,16 @@
+@@ -9506,6 +11353,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -12315,7 +14484,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9517,7 +10751,7 @@
+@@ -9517,7 +11374,7 @@
        lt_prog_compiler_wl='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -12324,7 +14493,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9540,13 +10774,20 @@
+@@ -9540,13 +11397,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -12347,7 +14516,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9561,15 +10802,15 @@
+@@ -9561,15 +11425,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -12369,7 +14538,7 @@
        ;;
  
      sunos4*)
-@@ -9578,7 +10819,7 @@
+@@ -9578,7 +11442,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -12378,7 +14547,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9591,6 +10832,17 @@
+@@ -9591,6 +11455,17 @@
        fi
        ;;
  
@@ -12396,7 +14565,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9602,16 +10854,16 @@
+@@ -9602,16 +11477,16 @@
      esac
    fi
  
@@ -12417,7 +14586,7 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9625,26 +10877,28 @@
+@@ -9625,26 +11500,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -12426,12 +14595,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9631: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10883: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11506: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9635: \$? = $ac_status" >&5
-+   echo "$as_me:10887: \$? = $ac_status" >&5
++   echo "$as_me:11510: \$? = $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
@@ -12453,7 +14622,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -9657,7 +10911,7 @@
+@@ -9657,7 +11534,7 @@
  fi
  
  fi
@@ -12462,13 +14631,12 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9667,72 +10921,112 @@
+@@ -9667,8 +11544,50 @@
      ;;
  esac
  
 -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o+set}" = set; then
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -12476,32 +14644,8 @@
 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_cv_prog_compiler_c_o=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--   # that will create temporary files in the current directory regardless of
--   # the output directory.  Thus, making CWD read-only will cause this test
--   # to fail, enabling locking or at least warning the user not to do parallel
--   # builds.
--   chmod -w .
--
--   lt_compiler_flag="-o out/conftest2.$ac_objext"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
--   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
--   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
--   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9698: $lt_compile\"" >&5)
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  lt_prog_compiler_static_works=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -12537,31 +14681,37 @@
 +
 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_prog_compiler_c_o=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
+ if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -9679,60 +11598,58 @@
+    mkdir out
+    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-   # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-   # that will create temporary files in the current directory regardless of
+-   # the output directory.  Thus, making CWD read-only will cause this test
+-   # to fail, enabling locking or at least warning the user not to do parallel
+-   # builds.
+-   chmod -w .
+-
+    lt_compiler_flag="-o out/conftest2.$ac_objext"
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:10987: $lt_compile\"" >&5)
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9698: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11610: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9702: \$? = $ac_status" >&5
-+   echo "$as_me:10991: \$? = $ac_status" >&5
++   echo "$as_me:11614: \$? = $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
@@ -12613,7 +14763,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9742,8 +11036,8 @@
+@@ -9742,8 +11659,8 @@
    need_locks=no
  fi
  
@@ -12624,7 +14774,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -9781,6 +11075,16 @@
+@@ -9781,6 +11698,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -12641,7 +14791,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9791,6 +11095,10 @@
+@@ -9791,6 +11718,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -12652,7 +14802,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9801,6 +11109,27 @@
+@@ -9801,6 +11732,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -12680,7 +14830,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9838,7 +11167,7 @@
+@@ -9838,7 +11790,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -12689,7 +14839,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9848,13 +11177,13 @@
+@@ -9848,13 +11800,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'
@@ -12706,7 +14856,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
-@@ -9863,23 +11192,70 @@
+@@ -9863,23 +11815,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -12782,7 +14932,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9893,13 +11269,40 @@
+@@ -9893,13 +11892,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12825,7 +14975,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9909,24 +11312,19 @@
+@@ -9909,24 +11935,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -12857,7 +15007,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9938,7 +11336,7 @@
+@@ -9938,7 +11959,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -12866,7 +15016,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9960,9 +11358,21 @@
+@@ -9960,9 +11981,21 @@
  	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
@@ -12890,7 +15040,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9979,7 +11389,7 @@
+@@ -9979,7 +12012,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -12899,7 +15049,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9998,8 +11408,12 @@
+@@ -9998,8 +12031,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -12912,7 +15062,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -10007,22 +11421,23 @@
+@@ -10007,22 +12044,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -12943,7 +15093,52 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10069,19 +11484,20 @@
+@@ -10038,24 +12076,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -10069,19 +12119,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12968,7 +15163,52 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10131,7 +11547,9 @@
+@@ -10100,24 +12151,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -10131,7 +12194,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12978,7 +15218,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10141,13 +11559,11 @@
+@@ -10141,13 +12206,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -12995,7 +15235,7 @@
  	fi
        fi
        ;;
-@@ -10160,7 +11576,7 @@
+@@ -10160,7 +12223,7 @@
        ld_shlibs=no
        ;;
  
@@ -13004,7 +15244,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10170,13 +11586,13 @@
+@@ -10170,13 +12233,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -13021,7 +15261,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.
-@@ -10186,52 +11602,52 @@
+@@ -10186,52 +12249,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -13114,7 +15354,7 @@
      fi
        ;;
  
-@@ -10265,8 +11681,8 @@
+@@ -10265,8 +12328,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -13125,7 +15365,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10274,7 +11690,7 @@
+@@ -10274,7 +12337,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -13134,7 +15374,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
-@@ -10288,47 +11704,62 @@
+@@ -10288,47 +12351,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -13221,7 +15461,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10342,7 +11773,7 @@
+@@ -10342,7 +12420,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -13230,7 +15470,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'
-@@ -10352,7 +11783,7 @@
+@@ -10352,7 +12430,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -13239,7 +15479,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10375,7 +11806,8 @@
+@@ -10375,7 +12453,8 @@
        hardcode_direct=yes
        hardcode_shlibpath_var=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -13249,7 +15489,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10385,7 +11817,7 @@
+@@ -10385,7 +12464,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -13258,7 +15498,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10396,14 +11828,14 @@
+@@ -10396,14 +12475,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -13275,7 +15515,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'
-@@ -10415,13 +11847,13 @@
+@@ -10415,13 +12494,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -13291,7 +15531,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10429,21 +11861,15 @@
+@@ -10429,21 +12508,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -13317,7 +15557,7 @@
  	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10452,8 +11878,18 @@
+@@ -10452,8 +12525,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -13338,7 +15578,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10462,7 +11898,7 @@
+@@ -10462,7 +12545,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.
@@ -13347,7 +15587,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10510,36 +11946,45 @@
+@@ -10510,36 +12593,45 @@
        fi
        ;;
  
@@ -13414,7 +15654,7 @@
        ;;
  
      uts4*)
-@@ -10554,15 +11999,10 @@
+@@ -10554,15 +12646,10 @@
      esac
    fi
  
@@ -13432,7 +15672,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10580,8 +12020,8 @@
+@@ -10580,8 +12667,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -13443,7 +15683,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -10595,6 +12035,7 @@
+@@ -10595,6 +12682,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -13451,7 +15691,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10617,20 +12058,20 @@
+@@ -10617,20 +12705,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -13477,7 +15717,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10640,7 +12081,20 @@
+@@ -10640,7 +12728,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -13499,7 +15739,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10705,7 +12159,7 @@
+@@ -10705,7 +12806,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -13508,7 +15748,7 @@
    ;;
  
  beos*)
-@@ -10714,7 +12168,7 @@
+@@ -10714,7 +12815,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -13517,7 +15757,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10730,7 +12184,7 @@
+@@ -10730,7 +12831,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -13526,7 +15766,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10742,7 +12196,8 @@
+@@ -10742,7 +12843,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -13536,7 +15776,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10772,7 +12227,7 @@
+@@ -10772,7 +12874,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -13545,7 +15785,7 @@
        ;;
      esac
      ;;
-@@ -10795,7 +12250,7 @@
+@@ -10795,7 +12897,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -13554,7 +15794,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"`
-@@ -10818,20 +12273,17 @@
+@@ -10818,20 +12920,17 @@
    dynamic_linker=no
    ;;
  
@@ -13586,7 +15826,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10849,14 +12301,19 @@
+@@ -10849,14 +12948,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -13608,7 +15848,7 @@
    esac
    ;;
  
-@@ -10876,9 +12333,9 @@
+@@ -10876,9 +12980,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -13620,7 +15860,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10893,7 +12350,7 @@
+@@ -10893,7 +12997,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -13629,7 +15869,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10904,7 +12361,7 @@
+@@ -10904,7 +13008,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -13638,7 +15878,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10916,6 +12373,18 @@
+@@ -10916,6 +13020,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -13657,7 +15897,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10959,29 +12428,26 @@
+@@ -10959,29 +13075,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -13694,7 +15934,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,
-@@ -10991,6 +12457,18 @@
+@@ -10991,6 +13104,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -13713,7 +15953,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -11000,7 +12478,7 @@
+@@ -11000,7 +13125,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -13722,7 +15962,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -11028,8 +12506,13 @@
+@@ -11028,8 +13153,13 @@
  
  openbsd*)
    version_type=sunos
@@ -13737,7 +15977,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
-@@ -11049,7 +12532,7 @@
+@@ -11049,7 +13179,7 @@
  
  os2*)
    libname_spec='$name'
@@ -13746,7 +15986,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11067,13 +12550,6 @@
+@@ -11067,13 +13197,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -13760,7 +16000,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11099,7 +12575,7 @@
+@@ -11099,7 +13222,7 @@
    need_version=yes
    ;;
  
@@ -13769,7 +16009,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11132,6 +12608,29 @@
+@@ -11132,6 +13255,29 @@
    fi
    ;;
  
@@ -13799,7 +16039,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11143,16 +12642,21 @@
+@@ -11143,16 +13289,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -13827,7 +16067,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11172,8 +12676,8 @@
+@@ -11172,8 +13323,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -13838,7 +16078,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -11186,29 +12690,29 @@
+@@ -11186,29 +13337,29 @@
  
  striplib=
  old_striplib=
@@ -13878,7 +16118,7 @@
      ;;
    esac
  fi
-@@ -11240,8 +12744,8 @@
+@@ -11240,8 +13391,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -13889,7 +16129,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11254,17 +12758,17 @@
+@@ -11254,40 +13405,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13911,7 +16151,50 @@
    ;
    return 0;
  }
-@@ -11296,14 +12800,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -11296,14 +13459,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13930,7 +16213,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -11317,8 +12822,8 @@
+@@ -11317,8 +13481,8 @@
     ;;
  
    *)
@@ -13941,7 +16224,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11345,30 +12850,24 @@
+@@ -11345,53 +13509,59 @@
  
  #undef shl_load
  
@@ -13977,7 +16260,50 @@
    ;
    return 0;
  }
-@@ -11400,18 +12899,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -11400,18 +13570,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14002,7 +16328,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11424,17 +12924,17 @@
+@@ -11424,40 +13595,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14024,7 +16350,50 @@
    ;
    return 0;
  }
-@@ -11466,19 +12966,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -11466,19 +13649,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14050,7 +16419,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11505,30 +13006,24 @@
+@@ -11505,53 +13689,59 @@
  
  #undef dlopen
  
@@ -14086,7 +16455,50 @@
    ;
    return 0;
  }
-@@ -11560,18 +13055,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -11560,18 +13750,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14111,7 +16523,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11584,17 +13080,17 @@
+@@ -11584,40 +13775,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14133,7 +16545,50 @@
    ;
    return 0;
  }
-@@ -11626,19 +13122,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -11626,19 +13829,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14159,7 +16614,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11651,17 +13148,17 @@
+@@ -11651,40 +13855,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14181,7 +16636,50 @@
    ;
    return 0;
  }
-@@ -11693,19 +13190,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -11693,19 +13909,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14207,7 +16705,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11718,17 +13216,17 @@
+@@ -11718,40 +13935,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14229,7 +16727,50 @@
    ;
    return 0;
  }
-@@ -11760,14 +13258,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -11760,14 +13989,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14248,7 +16789,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -11802,13 +13301,13 @@
+@@ -11802,13 +14032,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -14265,16 +16806,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11818,7 +13317,7 @@
+@@ -11818,7 +14048,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11821 "configure"
-+#line 13320 "configure"
++#line 14051 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11875,6 +13374,8 @@
+@@ -11875,6 +14105,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -14283,7 +16824,7 @@
  
      exit (status);
  }
-@@ -11884,12 +13385,12 @@
+@@ -11884,12 +14116,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -14298,7 +16839,7 @@
      esac
    else :
      # compilation failed
-@@ -11900,13 +13401,13 @@
+@@ -11900,13 +14132,13 @@
  
  
  fi
@@ -14317,16 +16858,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11916,7 +13417,7 @@
+@@ -11916,7 +14148,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11919 "configure"
-+#line 13420 "configure"
++#line 14151 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11973,6 +13474,8 @@
+@@ -11973,6 +14205,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -14335,7 +16876,7 @@
  
      exit (status);
  }
-@@ -11982,12 +13485,12 @@
+@@ -11982,12 +14216,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -14350,7 +16891,7 @@
      esac
    else :
      # compilation failed
-@@ -11998,8 +13501,8 @@
+@@ -11998,8 +14232,8 @@
  
  
  fi
@@ -14361,7 +16902,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -12020,19 +13523,19 @@
+@@ -12020,19 +14254,19 @@
  fi
  
  
@@ -14389,7 +16930,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12041,58 +13544,21 @@
+@@ -12041,58 +14275,21 @@
    fi
    ;;
  
@@ -14455,7 +16996,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12107,7 +13573,8 @@
+@@ -12107,7 +14304,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.
@@ -14465,7 +17006,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 \
-@@ -12221,11 +13688,11 @@
+@@ -12221,11 +14419,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -14479,7 +17020,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12255,6 +13722,12 @@
+@@ -12255,6 +14453,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -14492,7 +17033,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12266,6 +13739,9 @@
+@@ -12266,6 +14470,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -14502,7 +17043,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12285,7 +13761,7 @@
+@@ -12285,7 +14492,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -14511,7 +17052,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12316,7 +13792,7 @@
+@@ -12316,7 +14523,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -14520,7 +17061,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12331,7 +13807,7 @@
+@@ -12331,7 +14538,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -14529,7 +17070,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12558,7 +14034,10 @@
+@@ -12558,7 +14765,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.
@@ -14541,7 +17082,7 @@
  fi
  
  
-@@ -12571,11 +14050,11 @@
+@@ -12571,11 +14781,11 @@
  CC="$lt_save_CC"
  
  
@@ -14557,7 +17098,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -12593,6 +14072,9 @@
+@@ -12593,6 +14803,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -14567,7 +17108,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12623,8 +14105,10 @@
+@@ -12623,8 +14836,10 @@
  
        case $tagname in
        CXX)
@@ -14580,7 +17121,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12643,6 +14127,7 @@
+@@ -12643,6 +14858,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -14588,7 +17129,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12660,7 +14145,7 @@
+@@ -12660,7 +14876,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -14597,7 +17138,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12670,17 +14155,34 @@
+@@ -12670,17 +14886,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -14633,7 +17174,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12691,18 +14193,27 @@
+@@ -12691,18 +14924,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -14664,7 +17205,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12716,18 +14227,18 @@
+@@ -12716,18 +14958,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -14689,7 +17230,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -12756,11 +14267,11 @@
+@@ -12756,11 +14998,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -14705,7 +17246,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12773,7 +14284,7 @@
+@@ -12773,7 +15015,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -14714,7 +17255,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -12793,21 +14304,21 @@
+@@ -12793,21 +15035,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -14743,7 +17284,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12817,8 +14328,8 @@
+@@ -12817,8 +15059,8 @@
    ;;
  esac
  fi
@@ -14754,7 +17295,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -12826,8 +14337,8 @@
+@@ -12826,8 +15068,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
@@ -14765,7 +17306,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12853,7 +14364,7 @@
+@@ -12853,7 +15095,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.
@@ -14774,7 +17315,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12868,8 +14379,8 @@
+@@ -12868,8 +15110,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -14785,7 +17326,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -12884,8 +14395,23 @@
+@@ -12884,8 +15126,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -14811,7 +17352,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12902,7 +14428,7 @@
+@@ -12902,7 +15159,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -14820,7 +17361,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12921,8 +14447,12 @@
+@@ -12921,8 +15178,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -14833,7 +17374,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12931,15 +14461,16 @@
+@@ -12931,15 +15192,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -14854,7 +17395,52 @@
      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.
-@@ -12992,20 +14523,21 @@
+@@ -12961,24 +15223,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -12992,20 +15266,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14879,7 +17465,52 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -13055,7 +14587,9 @@
+@@ -13024,24 +15299,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -13055,7 +15342,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14889,7 +17520,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13065,16 +14599,26 @@
+@@ -13065,16 +15354,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -14921,7 +17552,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13088,12 +14632,12 @@
+@@ -13088,12 +15387,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'
@@ -14936,7 +17567,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
-@@ -13102,70 +14646,81 @@
+@@ -13102,70 +15401,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -15070,7 +17701,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13176,14 +14731,14 @@
+@@ -13176,14 +15486,14 @@
  	;;
      esac
      ;;
@@ -15087,7 +17718,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13200,12 +14755,12 @@
+@@ -13200,12 +15510,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -15103,7 +17734,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13214,11 +14769,11 @@
+@@ -13214,11 +15524,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.
@@ -15117,7 +17748,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13228,33 +14783,22 @@
+@@ -13228,33 +15538,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -15158,7 +17789,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13265,17 +14809,20 @@
+@@ -13265,17 +15564,20 @@
      esac
  
      case $cc_basename in
@@ -15185,7 +17816,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13291,12 +14838,15 @@
+@@ -13291,12 +15593,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -15205,7 +17836,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13307,11 +14857,25 @@
+@@ -13307,11 +15612,25 @@
  	;;
      esac
      ;;
@@ -15233,7 +17864,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13322,9 +14886,9 @@
+@@ -13322,9 +15641,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -15245,7 +17876,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13333,16 +14897,16 @@
+@@ -13333,16 +15652,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -15266,7 +17897,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13360,20 +14924,44 @@
+@@ -13360,20 +15679,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -15317,7 +17948,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13401,7 +14989,7 @@
+@@ -13401,7 +15744,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -15326,7 +17957,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13411,7 +14999,7 @@
+@@ -13411,7 +15754,7 @@
  	;;
      esac
      ;;
@@ -15335,7 +17966,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=
-@@ -13422,15 +15010,31 @@
+@@ -13422,15 +15765,31 @@
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
@@ -15369,7 +18000,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13440,14 +15044,14 @@
+@@ -13440,14 +15799,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -15387,7 +18018,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13465,7 +15069,7 @@
+@@ -13465,7 +15824,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -15396,7 +18027,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13484,13 +15088,13 @@
+@@ -13484,13 +15843,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -15412,7 +18043,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13499,17 +15103,17 @@
+@@ -13499,17 +15858,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -15434,7 +18065,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13528,7 +15132,7 @@
+@@ -13528,7 +15887,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -15443,7 +18074,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13549,27 +15153,14 @@
+@@ -13549,27 +15908,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -15473,7 +18104,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13582,36 +15173,33 @@
+@@ -13582,36 +15928,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -15522,7 +18153,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13619,9 +15207,9 @@
+@@ -13619,9 +15962,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -15534,7 +18165,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13631,9 +15219,9 @@
+@@ -13631,9 +15974,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
@@ -15546,7 +18177,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13642,9 +15230,9 @@
+@@ -13642,9 +15985,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -15558,7 +18189,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13657,12 +15245,63 @@
+@@ -13657,12 +16000,63 @@
  	;;
      esac
      ;;
@@ -15624,7 +18255,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13682,8 +15321,8 @@
+@@ -13682,8 +16076,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -15635,7 +18266,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -13719,7 +15358,7 @@
+@@ -13719,7 +16113,7 @@
    # The `*' in the case matches for architectures that use `case' in
    # $output_verbose_cmd can trigger glob expansion during the loop
    # eval without this substitution.
@@ -15644,7 +18275,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13759,7 +15398,7 @@
+@@ -13759,7 +16153,7 @@
         fi
         ;;
  
@@ -15653,7 +18284,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13795,6 +15434,29 @@
+@@ -13795,6 +16189,29 @@
  
  $rm -f confest.$objext
  
@@ -15683,7 +18314,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13803,8 +15465,8 @@
+@@ -13803,8 +16220,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -15694,7 +18325,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -13842,6 +15504,10 @@
+@@ -13842,6 +16259,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -15705,7 +18336,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13850,7 +15516,7 @@
+@@ -13850,7 +16271,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -15714,7 +18345,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13875,18 +15541,28 @@
+@@ -13875,18 +16296,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -15746,7 +18377,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13894,22 +15570,22 @@
+@@ -13894,22 +16325,22 @@
  	    ;;
  	esac
  	;;
@@ -15775,7 +18406,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13922,9 +15598,13 @@
+@@ -13922,9 +16353,13 @@
  	    ;;
  	esac
  	;;
@@ -15790,7 +18421,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13933,20 +15613,26 @@
+@@ -13933,20 +16368,26 @@
  	    ;;
  	esac
  	;;
@@ -15821,7 +18452,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13963,25 +15649,25 @@
+@@ -13963,25 +16404,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -15852,7 +18483,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13995,24 +15681,15 @@
+@@ -13995,24 +16436,15 @@
  	;;
        psos*)
  	;;
@@ -15879,7 +18510,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -14022,12 +15699,12 @@
+@@ -14022,12 +16454,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -15894,7 +18525,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -14037,7 +15714,7 @@
+@@ -14037,7 +16469,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -15903,7 +18534,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14045,7 +15722,14 @@
+@@ -14045,7 +16477,14 @@
  	    ;;
  	esac
  	;;
@@ -15919,7 +18550,7 @@
  	;;
        vxworks*)
  	;;
-@@ -14055,16 +15739,16 @@
+@@ -14055,16 +16494,16 @@
      esac
    fi
  
@@ -15940,7 +18571,7 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14078,26 +15762,28 @@
+@@ -14078,26 +16517,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -15949,12 +18580,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14084: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15768: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16523: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14088: \$? = $ac_status" >&5
-+   echo "$as_me:15772: \$? = $ac_status" >&5
++   echo "$as_me:16527: \$? = $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
@@ -15976,7 +18607,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -14110,7 +15796,7 @@
+@@ -14110,7 +16551,7 @@
  fi
  
  fi
@@ -15985,7 +18616,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -14120,8 +15806,50 @@
+@@ -14120,8 +16561,50 @@
      ;;
  esac
  
@@ -16038,7 +18669,7 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14132,60 +15860,58 @@
+@@ -14132,60 +16615,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -16060,12 +18691,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14151: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15872: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16627: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14155: \$? = $ac_status" >&5
-+   echo "$as_me:15876: \$? = $ac_status" >&5
++   echo "$as_me:16631: \$? = $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
@@ -16117,7 +18748,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14195,8 +15921,8 @@
+@@ -14195,8 +16676,8 @@
    need_locks=no
  fi
  
@@ -16128,7 +18759,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -14213,22 +15939,20 @@
+@@ -14213,22 +16694,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -16157,7 +18788,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14246,8 +15970,8 @@
+@@ -14246,8 +16725,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -16168,7 +18799,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -14261,6 +15985,7 @@
+@@ -14261,6 +16740,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -16176,7 +18807,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14283,20 +16008,20 @@
+@@ -14283,20 +16763,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -16202,7 +18833,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14306,7 +16031,20 @@
+@@ -14306,7 +16786,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16224,7 +18855,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14371,7 +16109,7 @@
+@@ -14371,7 +16864,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -16233,7 +18864,7 @@
    ;;
  
  beos*)
-@@ -14380,7 +16118,7 @@
+@@ -14380,7 +16873,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -16242,7 +18873,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14396,7 +16134,7 @@
+@@ -14396,7 +16889,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -16251,7 +18882,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14408,7 +16146,8 @@
+@@ -14408,7 +16901,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -16261,7 +18892,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14438,7 +16177,7 @@
+@@ -14438,7 +16932,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -16270,7 +18901,7 @@
        ;;
      esac
      ;;
-@@ -14461,7 +16200,7 @@
+@@ -14461,7 +16955,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -16279,7 +18910,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"`
-@@ -14484,20 +16223,17 @@
+@@ -14484,20 +16978,17 @@
    dynamic_linker=no
    ;;
  
@@ -16311,7 +18942,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14515,14 +16251,19 @@
+@@ -14515,14 +17006,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -16333,7 +18964,7 @@
    esac
    ;;
  
-@@ -14542,9 +16283,9 @@
+@@ -14542,9 +17038,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -16345,7 +18976,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14559,7 +16300,7 @@
+@@ -14559,7 +17055,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -16354,7 +18985,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14570,7 +16311,7 @@
+@@ -14570,7 +17066,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -16363,10 +18994,15 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14582,6 +16323,18 @@
+@@ -14582,11 +17078,23 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
 +interix3*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -16379,10 +19015,15 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
- irix5* | irix6* | nonstopux*)
-   case $host_os in
-     nonstopux*) version_type=nonstopux ;;
-@@ -14625,29 +16378,26 @@
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
+ 		version_type=linux
+ 	else
+ 		version_type=irix
+@@ -14625,29 +17133,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -16419,7 +19060,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,
-@@ -14657,6 +16407,18 @@
+@@ -14657,6 +17162,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -16438,7 +19079,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14666,7 +16428,7 @@
+@@ -14666,7 +17183,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -16447,7 +19088,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14694,8 +16456,13 @@
+@@ -14694,8 +17211,13 @@
  
  openbsd*)
    version_type=sunos
@@ -16462,7 +19103,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
-@@ -14715,7 +16482,7 @@
+@@ -14715,7 +17237,7 @@
  
  os2*)
    libname_spec='$name'
@@ -16471,7 +19112,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14733,13 +16500,6 @@
+@@ -14733,13 +17255,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -16485,7 +19126,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14765,7 +16525,7 @@
+@@ -14765,7 +17280,7 @@
    need_version=yes
    ;;
  
@@ -16494,7 +19135,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14798,6 +16558,29 @@
+@@ -14798,6 +17313,29 @@
    fi
    ;;
  
@@ -16524,7 +19165,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14809,16 +16592,21 @@
+@@ -14809,16 +17347,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -16552,7 +19193,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14838,8 +16626,8 @@
+@@ -14838,8 +17381,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -16563,7 +19204,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -14850,1146 +16638,321 @@
+@@ -14850,1164 +17393,339 @@
    enable_fast_install=needless
  fi
  
@@ -16592,17 +19233,7 @@
 -   *)
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
--    ;;
--  esac
--fi
- 
--if test "x$enable_dlopen" != xyes; then
--  enable_dlopen=unknown
--  enable_dlopen_self=unknown
--  enable_dlopen_self_static=unknown
--else
--  lt_cv_dlopen=no
--  lt_cv_dlopen_libs=
++
 +# The else clause should only fire when bootstrapping the
 +# libtool distribution, otherwise you forgot to ship ltmain.sh
 +# with your package, and you will get complaints that there are
@@ -16660,12 +19291,7 @@
 +    lt_cv_prog_compiler_c_o_CXX \
 +    exclude_expsyms_CXX \
 +    include_expsyms_CXX; do
- 
--  case $host_os in
--  beos*)
--    lt_cv_dlopen="load_add_on"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
++
 +    case $var in
 +    old_archive_cmds_CXX | \
 +    old_archive_from_new_cmds_CXX | \
@@ -16692,20 +19318,39 @@
 +  *'\$0 --fallback-echo"')
 +    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
      ;;
-+  esac
+   esac
+-fi
  
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
++cfgfile="$ofile"
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ;;
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+ 
 -  mingw* | pw32*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
 -   ;;
-+cfgfile="$ofile"
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
  
 -  cygwin*)
 -    lt_cv_dlopen="dlopen"
 -    lt_cv_dlopen_libs=
 -   ;;
-+  cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
  
 -  darwin*)
 -  # if libdl is installed we need to link against it
@@ -16722,7 +19367,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -16765,8 +19411,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -16779,22 +19425,24 @@
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
  
 -    lt_cv_dlopen="dyld"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
  
 -fi
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
  
 -   ;;
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
  
 -  *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -16811,31 +19459,30 @@
 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define shl_load innocuous_shl_load
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shl_load (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
  
 -#undef shl_load
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++# A C compiler.
++LTCC=$lt_LTCC
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -16856,9 +19503,8 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
  
 -int
 -main ()
@@ -16894,8 +19540,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# A C compiler.
-+LTCC=$lt_LTCC
++# A language-specific compiler.
++CC=$lt_compiler_CXX
  
 -ac_cv_func_shl_load=no
 -fi
@@ -16920,8 +19566,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -16964,8 +19610,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# An ERE matcher.
++EGREP=$lt_EGREP
  
 -ac_cv_lib_dld_shl_load=no
 -fi
@@ -16992,27 +19638,27 @@
 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define dlopen innocuous_dlopen
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# The linker used to build libraries.
++LD=$lt_LD_CXX
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# A BSD-compatible nm program.
++NM=$lt_NM
  
 -#undef dlopen
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# A symbol stripping program
++STRIP=$lt_STRIP
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -17033,8 +19679,8 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
  
 -int
 -main ()
@@ -17070,8 +19716,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
  
 -ac_cv_func_dlopen=no
 -fi
@@ -17096,8 +19742,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -17140,8 +19786,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
++# Used on cygwin: assembler.
++AS="$AS"
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -17167,8 +19813,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -17211,8 +19857,9 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Used on cygwin: assembler.
-+AS="$AS"
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
  
 -ac_cv_lib_svld_dlopen=no
 -fi
@@ -17238,8 +19885,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -17282,9 +19929,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
++# Object file suffix (normally "o").
++objext="$ac_objext"
  
 -ac_cv_lib_dld_dld_link=no
 -fi
@@ -17297,13 +19943,6 @@
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
- 
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
- 
--fi
 +# Old archive suffix (normally "a").
 +libext="$libext"
  
@@ -17336,35 +19975,42 @@
 +# Do we need a version for libraries?
 +need_version=$need_version
  
--    ;;
--  esac
 +# Whether dlopen is supported.
 +dlopen_support=$enable_dlopen
  
+-fi
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
+ 
+-    ;;
+-  esac
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+ 
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
 -    enable_dlopen=no
 -  fi
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
  
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
 -    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  
 -    save_LDFLAGS="$LDFLAGS"
 -    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
  
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
  
 -    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
@@ -17379,18 +20025,18 @@
 -  cat > conftest.$ac_ext <<EOF
 -#line 15487 "configure"
 -#include "confdefs.h"
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Library versioning type.
++version_type=$version_type
  
 -#include <stdio.h>
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -17401,8 +20047,9 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# Library versioning type.
-+version_type=$version_type
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
  
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
@@ -17425,23 +20072,25 @@
 -#    endif
 -#  endif
 -#endif
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
  
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
  
 -  if (self)
 -    {
@@ -17449,11 +20098,8 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
  
 -    exit (status);
 -}
@@ -17476,21 +20122,23 @@
 -  fi
 -fi
 -rm -fr conftest*
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
- 
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
- 
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 +# Commands used to build and install a shared archive.
 +archive_cmds=$lt_archive_cmds_CXX
 +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
 +postinstall_cmds=$lt_postinstall_cmds
 +postuninstall_cmds=$lt_postuninstall_cmds
  
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
+ 
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+ 
 -    if test "x$lt_cv_dlopen_self" = xyes; then
 -      LDFLAGS="$LDFLAGS $link_static_flag"
 -      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -17506,21 +20154,21 @@
 -  cat > conftest.$ac_ext <<EOF
 -#line 15585 "configure"
 -#include "confdefs.h"
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
  
 -#include <stdio.h>
 +# Dependencies to place before the objects being linked to create a
 +# shared library.
-+predep_objects=$lt_predep_objects_CXX
++predeps=$lt_predeps_CXX
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -17533,7 +20181,7 @@
 -#endif
 +# Dependencies to place after the objects being linked to create a
 +# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
++postdeps=$lt_postdeps_CXX
  
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
@@ -17556,25 +20204,23 @@
 -#    endif
 -#  endif
 -#endif
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
  
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
  
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
  
 -  if (self)
 -    {
@@ -17582,8 +20228,8 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
  
 -    exit (status);
 -}
@@ -17606,43 +20252,45 @@
 -  fi
 -fi
 -rm -fr conftest*
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
  
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
  
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 -    fi
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
  
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
  
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
  
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
 -  esac
 -fi
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  
--
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
+ 
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
 -# with your package, and you will get complaints that there are
@@ -17699,7 +20347,9 @@
 -    lt_cv_prog_compiler_c_o_CXX \
 -    exclude_expsyms_CXX \
 -    include_expsyms_CXX; do
--
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
+ 
 -    case $var in
 -    old_archive_cmds_CXX | \
 -    old_archive_from_new_cmds_CXX | \
@@ -17721,13 +20371,17 @@
 -      ;;
 -    esac
 -  done
--
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
 -  case $lt_echo in
 -  *'\$0 --fallback-echo"')
 -    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
 -    ;;
 -  esac
--
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_CXX
+ 
 -cfgfile="$ofile"
 -
 -  cat <<__EOF__ >> "$cfgfile"
@@ -17947,12 +20601,30 @@
 -
 -# Transform the output of nm in a proper C declaration
 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
+-
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+-
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_CXX
+-
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
  
- # Transform the output of nm in a C name address pair
- global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-@@ -16077,7 +17040,10 @@
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+@@ -16077,7 +17795,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.
@@ -17964,7 +20636,7 @@
  fi
  
  
-@@ -16149,29 +17115,55 @@
+@@ -16149,29 +17870,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -18028,7 +20700,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16179,21 +17171,21 @@
+@@ -16179,21 +17926,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -18060,7 +20732,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16202,8 +17194,8 @@
+@@ -16202,8 +17949,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -18071,7 +20743,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -16241,6 +17233,11 @@
+@@ -16241,6 +17988,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -18083,7 +20755,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16257,7 +17254,7 @@
+@@ -16257,7 +18009,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -18092,7 +20764,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16283,6 +17280,16 @@
+@@ -16283,6 +18035,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -18109,7 +20781,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16294,7 +17301,7 @@
+@@ -16294,7 +18056,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -18118,7 +20790,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16317,13 +17324,20 @@
+@@ -16317,13 +18079,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -18141,7 +20813,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16338,15 +17352,15 @@
+@@ -16338,15 +18107,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -18163,7 +20835,7 @@
        ;;
  
      sunos4*)
-@@ -16355,7 +17369,7 @@
+@@ -16355,7 +18124,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -18172,7 +20844,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16368,6 +17382,17 @@
+@@ -16368,6 +18137,17 @@
        fi
        ;;
  
@@ -18190,7 +20862,7 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16379,16 +17404,16 @@
+@@ -16379,16 +18159,16 @@
      esac
    fi
  
@@ -18211,7 +20883,7 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16402,26 +17427,28 @@
+@@ -16402,26 +18182,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -18220,12 +20892,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16408: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17433: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18188: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16412: \$? = $ac_status" >&5
-+   echo "$as_me:17437: \$? = $ac_status" >&5
++   echo "$as_me:18192: \$? = $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
@@ -18247,7 +20919,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -16434,7 +17461,7 @@
+@@ -16434,7 +18216,7 @@
  fi
  
  fi
@@ -18256,7 +20928,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16444,8 +17471,50 @@
+@@ -16444,8 +18226,50 @@
      ;;
  esac
  
@@ -18309,7 +20981,7 @@
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16456,60 +17525,58 @@
+@@ -16456,60 +18280,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -18331,12 +21003,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16475: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17537: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18292: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16479: \$? = $ac_status" >&5
-+   echo "$as_me:17541: \$? = $ac_status" >&5
++   echo "$as_me:18296: \$? = $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
@@ -18388,7 +21060,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16519,8 +17586,8 @@
+@@ -16519,8 +18341,8 @@
    need_locks=no
  fi
  
@@ -18399,7 +21071,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -16558,6 +17625,16 @@
+@@ -16558,6 +18380,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -18416,7 +21088,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16568,6 +17645,10 @@
+@@ -16568,6 +18400,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -18427,7 +21099,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16578,6 +17659,27 @@
+@@ -16578,6 +18414,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -18455,7 +21127,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16615,7 +17717,7 @@
+@@ -16615,7 +18472,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -18464,7 +21136,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16625,13 +17727,13 @@
+@@ -16625,13 +18482,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'
@@ -18481,7 +21153,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
-@@ -16640,23 +17742,70 @@
+@@ -16640,23 +18497,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -18558,7 +21230,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16670,13 +17819,40 @@
+@@ -16670,13 +18574,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -18601,7 +21273,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16686,24 +17862,19 @@
+@@ -16686,24 +18617,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -18633,7 +21305,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16715,7 +17886,7 @@
+@@ -16715,7 +18641,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -18642,7 +21314,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16737,9 +17908,21 @@
+@@ -16737,9 +18663,21 @@
  	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
@@ -18666,7 +21338,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16756,7 +17939,7 @@
+@@ -16756,7 +18694,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -18675,7 +21347,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16775,8 +17958,12 @@
+@@ -16775,8 +18713,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -18688,7 +21360,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16784,22 +17971,23 @@
+@@ -16784,45 +18726,58 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -18719,7 +21391,50 @@
        program main
  
        end
-@@ -16836,19 +18024,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -16836,19 +18791,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -18744,7 +21459,52 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16888,7 +18077,9 @@
+@@ -16857,24 +18813,36 @@
+       end
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -16888,7 +18856,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -18754,7 +21514,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16898,13 +18089,11 @@
+@@ -16898,13 +18868,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -18771,7 +21531,7 @@
  	fi
        fi
        ;;
-@@ -16917,7 +18106,7 @@
+@@ -16917,7 +18885,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -18780,7 +21540,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16927,68 +18116,68 @@
+@@ -16927,68 +18895,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -18893,7 +21653,7 @@
      fi
        ;;
  
-@@ -17022,8 +18211,8 @@
+@@ -17022,8 +18990,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -18904,7 +21664,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -17031,7 +18220,7 @@
+@@ -17031,7 +18999,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -18913,7 +21673,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
-@@ -17045,47 +18234,62 @@
+@@ -17045,47 +19013,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -19000,7 +21760,7 @@
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17099,7 +18303,7 @@
+@@ -17099,7 +19082,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -19009,7 +21769,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'
-@@ -17109,7 +18313,7 @@
+@@ -17109,7 +19092,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -19018,7 +21778,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
-@@ -17132,7 +18336,8 @@
+@@ -17132,7 +19115,8 @@
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -19028,7 +21788,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17142,7 +18347,7 @@
+@@ -17142,7 +19126,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -19037,7 +21797,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17153,14 +18358,14 @@
+@@ -17153,14 +19137,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -19054,7 +21814,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'
-@@ -17172,13 +18377,13 @@
+@@ -17172,13 +19156,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -19070,7 +21830,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17186,21 +18391,15 @@
+@@ -17186,21 +19170,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -19096,7 +21856,7 @@
  	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17209,8 +18408,18 @@
+@@ -17209,8 +19187,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -19117,7 +21877,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17219,7 +18428,7 @@
+@@ -17219,7 +19207,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.
@@ -19126,7 +21886,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17267,36 +18476,45 @@
+@@ -17267,36 +19255,45 @@
        fi
        ;;
  
@@ -19193,7 +21953,7 @@
        ;;
  
      uts4*)
-@@ -17311,15 +18529,10 @@
+@@ -17311,15 +19308,10 @@
      esac
    fi
  
@@ -19211,7 +21971,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17337,8 +18550,8 @@
+@@ -17337,8 +19329,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -19222,7 +21982,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -17352,6 +18565,7 @@
+@@ -17352,6 +19344,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -19230,7 +21990,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17374,20 +18588,20 @@
+@@ -17374,20 +19367,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -19256,7 +22016,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17397,7 +18611,20 @@
+@@ -17397,7 +19390,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19278,7 +22038,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17462,7 +18689,7 @@
+@@ -17462,7 +19468,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -19287,7 +22047,7 @@
    ;;
  
  beos*)
-@@ -17471,7 +18698,7 @@
+@@ -17471,7 +19477,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -19296,7 +22056,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17487,7 +18714,7 @@
+@@ -17487,7 +19493,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -19305,7 +22065,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17499,7 +18726,8 @@
+@@ -17499,7 +19505,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -19315,7 +22075,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17529,7 +18757,7 @@
+@@ -17529,7 +19536,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -19324,7 +22084,7 @@
        ;;
      esac
      ;;
-@@ -17552,7 +18780,7 @@
+@@ -17552,7 +19559,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -19333,7 +22093,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"`
-@@ -17575,20 +18803,17 @@
+@@ -17575,20 +19582,17 @@
    dynamic_linker=no
    ;;
  
@@ -19365,7 +22125,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17606,14 +18831,19 @@
+@@ -17606,14 +19610,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -19387,7 +22147,7 @@
    esac
    ;;
  
-@@ -17633,9 +18863,9 @@
+@@ -17633,9 +19642,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -19399,7 +22159,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17650,7 +18880,7 @@
+@@ -17650,7 +19659,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -19408,7 +22168,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17661,7 +18891,7 @@
+@@ -17661,7 +19670,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -19417,7 +22177,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17673,6 +18903,18 @@
+@@ -17673,6 +19682,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -19436,7 +22196,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17716,30 +18958,27 @@
+@@ -17716,29 +19737,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -19464,18 +22224,16 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
--  # We used to test for /lib/ld.so.1 and disable shared libraries on
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-   # most powerpc-linux boxes support dynamic linking these days and
-@@ -17748,6 +18987,18 @@
+@@ -17748,6 +19766,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -19494,7 +22252,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17757,7 +19008,7 @@
+@@ -17757,7 +19787,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -19503,7 +22261,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17785,8 +19036,13 @@
+@@ -17785,8 +19815,13 @@
  
  openbsd*)
    version_type=sunos
@@ -19518,7 +22276,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
-@@ -17806,7 +19062,7 @@
+@@ -17806,7 +19841,7 @@
  
  os2*)
    libname_spec='$name'
@@ -19527,7 +22285,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17824,13 +19080,6 @@
+@@ -17824,13 +19859,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -19541,7 +22299,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17856,7 +19105,7 @@
+@@ -17856,7 +19884,7 @@
    need_version=yes
    ;;
  
@@ -19550,7 +22308,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17889,6 +19138,29 @@
+@@ -17889,6 +19917,29 @@
    fi
    ;;
  
@@ -19580,7 +22338,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17900,16 +19172,21 @@
+@@ -17900,16 +19951,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -19608,7 +22366,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17929,8 +19206,8 @@
+@@ -17929,8 +19985,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -19619,7 +22377,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -17941,36 +19218,6 @@
+@@ -17941,36 +19997,6 @@
    enable_fast_install=needless
  fi
  
@@ -19656,7 +22414,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17985,7 +19232,8 @@
+@@ -17985,7 +20011,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.
@@ -19666,7 +22424,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 \
-@@ -18085,6 +19333,12 @@
+@@ -18085,6 +20112,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -19679,7 +22437,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18096,6 +19350,9 @@
+@@ -18096,6 +20129,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -19689,7 +22447,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18115,7 +19372,7 @@
+@@ -18115,7 +20151,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -19698,7 +22456,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18146,7 +19403,7 @@
+@@ -18146,7 +20182,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -19707,7 +22465,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18161,7 +19418,7 @@
+@@ -18161,7 +20197,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -19716,7 +22474,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18363,7 +19620,10 @@
+@@ -18363,7 +20399,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.
@@ -19728,7 +22486,7 @@
  fi
  
  
-@@ -18384,7 +19644,6 @@
+@@ -18384,7 +20423,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -19736,7 +22494,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -18396,26 +19655,55 @@
+@@ -18396,26 +20434,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -19793,7 +22551,7 @@
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
  ## the running order or otherwise move them around unless you know exactly
-@@ -18427,8 +19715,8 @@
+@@ -18427,8 +20494,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -19804,7 +22562,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18442,26 +19730,28 @@
+@@ -18442,26 +20509,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -19813,12 +22571,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18448: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19736: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20515: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18452: \$? = $ac_status" >&5
-+   echo "$as_me:19740: \$? = $ac_status" >&5
++   echo "$as_me:20519: \$? = $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
@@ -19840,7 +22598,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18475,8 +19765,8 @@
+@@ -18475,8 +20544,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -19851,7 +22609,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18514,6 +19804,11 @@
+@@ -18514,6 +20583,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -19863,7 +22621,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18530,7 +19825,7 @@
+@@ -18530,7 +20604,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -19872,7 +22630,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18556,6 +19851,16 @@
+@@ -18556,6 +20630,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -19889,7 +22647,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18567,7 +19872,7 @@
+@@ -18567,7 +20651,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -19898,7 +22656,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18590,13 +19895,20 @@
+@@ -18590,13 +20674,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -19921,7 +22679,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18611,15 +19923,15 @@
+@@ -18611,15 +20702,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -19943,7 +22701,7 @@
        ;;
  
      sunos4*)
-@@ -18628,7 +19940,7 @@
+@@ -18628,7 +20719,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -19952,7 +22710,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18641,6 +19953,17 @@
+@@ -18641,6 +20732,17 @@
        fi
        ;;
  
@@ -19970,7 +22728,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18652,16 +19975,16 @@
+@@ -18652,16 +20754,16 @@
      esac
    fi
  
@@ -19991,7 +22749,7 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18675,26 +19998,28 @@
+@@ -18675,26 +20777,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -20000,12 +22758,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18681: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20004: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20783: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18685: \$? = $ac_status" >&5
-+   echo "$as_me:20008: \$? = $ac_status" >&5
++   echo "$as_me:20787: \$? = $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
@@ -20027,7 +22785,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -18707,7 +20032,7 @@
+@@ -18707,7 +20811,7 @@
  fi
  
  fi
@@ -20036,7 +22794,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18717,8 +20042,50 @@
+@@ -18717,8 +20821,50 @@
      ;;
  esac
  
@@ -20089,7 +22847,7 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18729,60 +20096,58 @@
+@@ -18729,60 +20875,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -20111,12 +22869,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18748: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20108: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:20887: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:18752: \$? = $ac_status" >&5
-+   echo "$as_me:20112: \$? = $ac_status" >&5
++   echo "$as_me:20891: \$? = $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
@@ -20168,7 +22926,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18792,8 +20157,8 @@
+@@ -18792,8 +20936,8 @@
    need_locks=no
  fi
  
@@ -20179,7 +22937,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -18831,6 +20196,16 @@
+@@ -18831,6 +20975,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -20196,7 +22954,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18841,6 +20216,10 @@
+@@ -18841,6 +20995,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -20207,7 +22965,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18851,6 +20230,27 @@
+@@ -18851,6 +21009,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -20235,7 +22993,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18888,7 +20288,7 @@
+@@ -18888,7 +21067,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -20244,7 +23002,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18898,13 +20298,13 @@
+@@ -18898,13 +21077,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'
@@ -20261,7 +23019,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
-@@ -18913,23 +20313,70 @@
+@@ -18913,23 +21092,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -20338,7 +23096,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18943,13 +20390,40 @@
+@@ -18943,13 +21169,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20381,7 +23139,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18959,24 +20433,19 @@
+@@ -18959,24 +21212,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20413,7 +23171,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18988,7 +20457,7 @@
+@@ -18988,7 +21236,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -20422,7 +23180,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -19010,9 +20479,21 @@
+@@ -19010,9 +21258,21 @@
  	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
@@ -20446,7 +23204,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -19029,7 +20510,7 @@
+@@ -19029,7 +21289,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -20455,7 +23213,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -19048,8 +20529,12 @@
+@@ -19048,8 +21308,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -20468,7 +23226,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19057,22 +20542,23 @@
+@@ -19057,22 +21321,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -20499,7 +23257,52 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19119,19 +20605,20 @@
+@@ -19088,24 +21353,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -19119,19 +21396,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -20524,7 +23327,52 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19181,7 +20668,9 @@
+@@ -19150,24 +21428,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -19181,7 +21471,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -20534,7 +23382,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -19191,13 +20680,11 @@
+@@ -19191,13 +21483,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -20551,7 +23399,7 @@
  	fi
        fi
        ;;
-@@ -19210,7 +20697,7 @@
+@@ -19210,7 +21500,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -20560,7 +23408,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19220,68 +20707,68 @@
+@@ -19220,68 +21510,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -20673,7 +23521,7 @@
      fi
        ;;
  
-@@ -19315,8 +20802,8 @@
+@@ -19315,8 +21605,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -20684,7 +23532,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19324,7 +20811,7 @@
+@@ -19324,7 +21614,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -20693,7 +23541,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
-@@ -19338,47 +20825,62 @@
+@@ -19338,47 +21628,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -20780,7 +23628,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19392,7 +20894,7 @@
+@@ -19392,7 +21697,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -20789,7 +23637,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'
-@@ -19402,7 +20904,7 @@
+@@ -19402,7 +21707,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -20798,7 +23646,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
-@@ -19425,7 +20927,8 @@
+@@ -19425,7 +21730,8 @@
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -20808,7 +23656,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19435,7 +20938,7 @@
+@@ -19435,7 +21741,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -20817,7 +23665,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19446,14 +20949,14 @@
+@@ -19446,14 +21752,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -20834,7 +23682,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'
-@@ -19465,13 +20968,13 @@
+@@ -19465,13 +21771,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -20850,7 +23698,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19479,21 +20982,15 @@
+@@ -19479,21 +21785,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -20876,7 +23724,7 @@
  	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19502,8 +20999,18 @@
+@@ -19502,8 +21802,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -20897,7 +23745,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19512,7 +21019,7 @@
+@@ -19512,7 +21822,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.
@@ -20906,7 +23754,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19560,36 +21067,45 @@
+@@ -19560,36 +21870,45 @@
        fi
        ;;
  
@@ -20973,7 +23821,7 @@
        ;;
  
      uts4*)
-@@ -19604,15 +21120,10 @@
+@@ -19604,15 +21923,10 @@
      esac
    fi
  
@@ -20991,7 +23839,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -19630,8 +21141,8 @@
+@@ -19630,8 +21944,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -21002,7 +23850,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -19645,6 +21156,7 @@
+@@ -19645,6 +21959,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_GCJ
@@ -21010,7 +23858,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -19667,20 +21179,20 @@
+@@ -19667,20 +21982,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -21036,7 +23884,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19690,7 +21202,20 @@
+@@ -19690,7 +22005,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21058,7 +23906,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19755,7 +21280,7 @@
+@@ -19755,7 +22083,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21067,7 +23915,7 @@
    ;;
  
  beos*)
-@@ -19764,7 +21289,7 @@
+@@ -19764,7 +22092,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -21076,7 +23924,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19780,7 +21305,7 @@
+@@ -19780,7 +22108,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -21085,7 +23933,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19792,7 +21317,8 @@
+@@ -19792,7 +22120,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -21095,7 +23943,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19822,7 +21348,7 @@
+@@ -19822,7 +22151,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21104,7 +23952,7 @@
        ;;
      esac
      ;;
-@@ -19845,7 +21371,7 @@
+@@ -19845,7 +22174,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -21113,7 +23961,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"`
-@@ -19868,20 +21394,17 @@
+@@ -19868,20 +22197,17 @@
    dynamic_linker=no
    ;;
  
@@ -21145,7 +23993,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19899,14 +21422,19 @@
+@@ -19899,14 +22225,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -21167,7 +24015,7 @@
    esac
    ;;
  
-@@ -19926,9 +21454,9 @@
+@@ -19926,9 +22257,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -21179,7 +24027,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19943,7 +21471,7 @@
+@@ -19943,7 +22274,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -21188,7 +24036,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19954,7 +21482,7 @@
+@@ -19954,7 +22285,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -21197,7 +24045,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19966,6 +21494,18 @@
+@@ -19966,6 +22297,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -21216,10 +24064,13 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -19992,1081 +21532,281 @@
-       libsuff=32 shlibsuff=N32 libmagic=N32;;
-     *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-       libsuff=64 shlibsuff=64 libmagic=64-bit;;
+@@ -19989,1084 +22332,284 @@
+     *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+       libsuff= shlibsuff= libmagic=32-bit;;
+     *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
 -    *) libsuff= shlibsuff= libmagic=never-match;;
 -    esac
 -    ;;
@@ -22104,7 +24955,20 @@
 -#endif
 -
 -#include <stdio.h>
--
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -22114,7 +24978,11 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
--
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
+ 
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -22136,29 +25004,42 @@
 -#    endif
 -#  endif
 -#endif
--
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
+ 
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
  
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
 +  ;;
  
 -  if (self)
@@ -22167,20 +25048,17 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
++netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
 +  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
  
 -    exit (status);
 -}
@@ -22200,36 +25078,35 @@
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self=no
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
    fi
 -fi
 -rm -fr conftest*
- 
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
+-
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
 +  ;;
  
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+netbsdelf*-gnu)
++newsos6)
 +  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
++  shlibpath_overrides_runpath=yes
 +  ;;
  
 -    if test "x$lt_cv_dlopen_self" = xyes; then
@@ -22247,35 +25124,6 @@
 -  cat > conftest.$ac_ext <<EOF
 -#line 20969 "configure"
 -#include "confdefs.h"
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
- 
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
- 
--#include <stdio.h>
 +nto-qnx*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -22286,14 +25134,8 @@
 +  shlibpath_overrides_runpath=yes
 +  ;;
  
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
 -#endif
 +openbsd*)
 +  version_type=sunos
@@ -22321,6 +25163,36 @@
 +  fi
 +  ;;
  
+-#include <stdio.h>
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
 -#ifndef LT_DLLAZY_OR_NOW
@@ -22342,34 +25214,6 @@
 -#    endif
 -#  endif
 -#endif
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
- 
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
 +solaris*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -22383,12 +25227,9 @@
 +  postinstall_cmds='chmod +x $lib'
 +  ;;
  
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
 +sunos4*)
 +  version_type=sunos
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -22401,20 +25242,11 @@
 +  need_version=yes
 +  ;;
  
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
 +sysv4 | sysv4.3*)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -22438,7 +25270,13 @@
 +      ;;
 +  esac
 +  ;;
-+
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
 +sysv4*MP*)
 +  if test -d /usr/nec ;then
 +    version_type=linux
@@ -22447,7 +25285,21 @@
 +    shlibpath_var=LD_LIBRARY_PATH
 +  fi
 +  ;;
-+
+ 
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -22550,7 +25402,7 @@
  fi
  
  
-@@ -21083,7 +21823,8 @@
+@@ -21083,7 +22626,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.
@@ -22560,7 +25412,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 \
-@@ -21183,6 +21924,12 @@
+@@ -21183,6 +22727,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -22573,7 +25425,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21194,6 +21941,9 @@
+@@ -21194,6 +22744,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -22583,7 +25435,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21213,7 +21963,7 @@
+@@ -21213,7 +22766,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -22592,7 +25444,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21244,7 +21994,7 @@
+@@ -21244,7 +22797,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -22601,7 +25453,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21259,7 +22009,7 @@
+@@ -21259,7 +22812,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -22610,7 +25462,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21461,7 +22211,10 @@
+@@ -21461,7 +23014,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.
@@ -22622,7 +25474,7 @@
  fi
  
  
-@@ -21481,7 +22234,6 @@
+@@ -21481,7 +23037,6 @@
        RC)
  
  
@@ -22630,7 +25482,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -21500,15 +22252,42 @@
+@@ -21500,15 +23055,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -22673,7 +25525,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21524,7 +22303,8 @@
+@@ -21524,7 +23106,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.
@@ -22683,7 +25535,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 \
-@@ -21624,6 +22404,12 @@
+@@ -21624,6 +23207,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -22696,7 +25548,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21635,6 +22421,9 @@
+@@ -21635,6 +23224,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -22706,7 +25558,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21654,7 +22443,7 @@
+@@ -21654,7 +23246,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -22715,7 +25567,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21685,7 +22474,7 @@
+@@ -21685,7 +23277,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -22724,7 +25576,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21700,7 +22489,7 @@
+@@ -21700,7 +23292,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -22733,7 +25585,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21902,7 +22691,10 @@
+@@ -21902,7 +23494,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.
@@ -22745,7 +25597,7 @@
  fi
  
  
-@@ -21949,7 +22741,7 @@
+@@ -21949,7 +23544,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -22754,7 +25606,7 @@
  
  # Prevent multiple expansion
  
-@@ -22004,8 +22796,8 @@
+@@ -22004,8 +23599,8 @@
  
      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -22765,7 +25617,7 @@
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22031,17 +22823,17 @@
+@@ -22031,17 +23626,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -22789,7 +25641,7 @@
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22056,32 +22848,33 @@
+@@ -22056,32 +23651,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22831,7 +25683,7 @@
          GMSGFMT=":"
        fi
        MSGFMT=$GMSGFMT
-@@ -22090,8 +22883,8 @@
+@@ -22090,8 +23686,8 @@
  
        # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -22842,7 +25694,7 @@
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22117,11 +22910,11 @@
+@@ -22117,11 +23713,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -22858,7 +25710,7 @@
  fi
  
  
-@@ -22129,8 +22922,8 @@
+@@ -22129,8 +23725,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -22869,7 +25721,7 @@
  	  XGETTEXT=":"
  	fi
        fi
-@@ -22140,8 +22933,7 @@
+@@ -22140,8 +23736,7 @@
  
  
  
@@ -22879,7 +25731,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22153,8 +22945,8 @@
+@@ -22153,8 +23748,8 @@
      ac_save_CXXFLAGS="$CXXFLAGS"
      CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
  
@@ -22890,7 +25742,52 @@
      if test "${kde_cv_stl_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22208,15 +23000,16 @@
+@@ -22182,24 +23777,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22208,15 +23815,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -22910,7 +25807,7 @@
  
     if test "$kde_cv_stl_works" = "yes"; then
       # back compatible
-@@ -22245,15 +23038,14 @@
+@@ -22245,15 +23853,14 @@
  
  
  
@@ -22929,7 +25826,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22265,9 +23057,6 @@
+@@ -22265,9 +23872,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -22939,7 +25836,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22319,8 +23108,9 @@
+@@ -22293,24 +23897,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22319,8 +23935,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -22950,7 +25892,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -22334,11 +23124,11 @@
+@@ -22334,11 +23951,11 @@
  fi
  
  
@@ -22966,7 +25908,7 @@
  if test "${kde_cv_proto_strlcat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22359,8 +23149,7 @@
+@@ -22359,8 +23976,7 @@
  if test "x$kde_cv_proto_strlcat" = xunknown; then
  
  
@@ -22976,7 +25918,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22425,9 +23214,10 @@
+@@ -22398,24 +24014,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22425,9 +24053,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -22988,7 +25975,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -22441,8 +23231,8 @@
+@@ -22441,8 +24070,8 @@
  
  fi
  
@@ -22999,7 +25986,7 @@
  
  if test "x$kde_cv_func_strlcat" = xyes; then
  
-@@ -22466,15 +23256,14 @@
+@@ -22466,15 +24095,14 @@
  
  
  
@@ -23018,7 +26005,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22486,9 +23275,6 @@
+@@ -22486,9 +24114,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -23028,7 +26015,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22539,8 +23325,9 @@
+@@ -22513,24 +24138,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22539,8 +24176,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23039,7 +26071,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -22554,11 +23341,11 @@
+@@ -22554,11 +24192,11 @@
  fi
  
  
@@ -23055,7 +26087,7 @@
  if test "${kde_cv_proto_strlcpy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22579,8 +23366,7 @@
+@@ -22579,8 +24217,7 @@
  if test "x$kde_cv_proto_strlcpy" = xunknown; then
  
  
@@ -23065,7 +26097,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22644,9 +23430,10 @@
+@@ -22617,24 +24254,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22644,9 +24293,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23077,7 +26154,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -22660,8 +23447,8 @@
+@@ -22660,8 +24310,8 @@
  
  fi
  
@@ -23088,7 +26165,7 @@
  
  if test "x$kde_cv_func_strlcpy" = xyes; then
  
-@@ -22684,8 +23471,8 @@
+@@ -22684,8 +24334,8 @@
  
  
  
@@ -23099,7 +26176,7 @@
  if test "${ac_cv_lib_util_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22702,7 +23489,7 @@
+@@ -22702,30 +24352,42 @@
  int
  main ()
  {
@@ -23108,7 +26185,50 @@
    ;
    return 0;
  }
-@@ -22734,20 +23521,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22734,20 +24396,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23135,7 +26255,7 @@
  if test "${ac_cv_lib_compat_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22764,7 +23552,7 @@
+@@ -22764,30 +24427,42 @@
  int
  main ()
  {
@@ -23144,7 +26264,50 @@
    ;
    return 0;
  }
-@@ -22796,21 +23584,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22796,21 +24471,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23172,7 +26335,7 @@
  if test "${ac_cv_lib_crypt_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22823,17 +23612,17 @@
+@@ -22823,40 +24499,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -23194,7 +26357,50 @@
    ;
    return 0;
  }
-@@ -22865,19 +23654,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22865,19 +24553,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23220,7 +26426,7 @@
  if test "${ac_cv_lib_c_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22890,17 +23680,17 @@
+@@ -22890,40 +24579,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -23242,7 +26448,50 @@
    ;
    return 0;
  }
-@@ -22932,14 +23722,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -22932,14 +24633,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23261,7 +26510,7 @@
  if test $ac_cv_lib_c_crypt = yes; then
    kde_have_crypt=yes
  else
-@@ -22965,13 +23756,13 @@
+@@ -22965,13 +24667,13 @@
  
     fi
  
@@ -23278,7 +26527,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23029,7 +23820,9 @@
+@@ -23000,24 +24702,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23029,7 +24743,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23288,7 +26582,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
        ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -23040,17 +23833,17 @@
+@@ -23040,17 +24756,17 @@
  
  fi
  
@@ -23311,7 +26605,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23108,7 +23901,9 @@
+@@ -23079,24 +24795,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23108,7 +24836,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23321,7 +26660,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
           done
           ac_ext=c
-@@ -23120,8 +23915,8 @@
+@@ -23120,8 +24850,8 @@
  
  fi
  
@@ -23332,7 +26671,7 @@
     fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -23134,8 +23929,8 @@
+@@ -23134,8 +24864,8 @@
  _ACEOF
  
  
@@ -23343,7 +26682,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23148,17 +23943,17 @@
+@@ -23148,40 +24878,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -23365,7 +26704,50 @@
    ;
    return 0;
  }
-@@ -23190,21 +23985,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23190,21 +24932,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23393,7 +26775,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23217,17 +24013,17 @@
+@@ -23217,40 +24960,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -23415,7 +26797,50 @@
    ;
    return 0;
  }
-@@ -23259,21 +24055,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23259,21 +25014,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23443,7 +26868,7 @@
  if test "${ac_cv_func_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23300,30 +24097,24 @@
+@@ -23300,53 +25056,59 @@
  
  #undef inet_ntoa
  
@@ -23479,7 +26904,50 @@
    ;
    return 0;
  }
-@@ -23355,17 +24146,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23355,17 +25117,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23503,7 +26971,7 @@
  if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23378,17 +24170,17 @@
+@@ -23378,40 +25141,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -23525,7 +26993,50 @@
    ;
    return 0;
  }
-@@ -23420,21 +24212,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23420,21 +25195,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23553,7 +27064,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23461,30 +24254,24 @@
+@@ -23461,53 +25237,59 @@
  
  #undef connect
  
@@ -23589,7 +27100,50 @@
    ;
    return 0;
  }
-@@ -23516,17 +24303,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23516,17 +25298,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23613,7 +27167,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23539,17 +24327,17 @@
+@@ -23539,40 +25322,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -23635,7 +27189,50 @@
    ;
    return 0;
  }
-@@ -23581,22 +24369,23 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23581,22 +25376,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23664,7 +27261,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23623,30 +24412,24 @@
+@@ -23623,53 +25419,59 @@
  
  #undef remove
  
@@ -23700,7 +27297,50 @@
    ;
    return 0;
  }
-@@ -23678,17 +24461,18 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23678,17 +25480,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23724,7 +27364,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23701,17 +24485,17 @@
+@@ -23701,40 +25504,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -23746,7 +27386,50 @@
    ;
    return 0;
  }
-@@ -23743,14 +24527,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23743,14 +25558,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23765,7 +27448,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -23758,8 +24543,8 @@
+@@ -23758,8 +25574,8 @@
     fi
  
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -23776,7 +27459,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23786,30 +24571,24 @@
+@@ -23786,53 +25602,59 @@
  
  #undef shmat
  
@@ -23812,7 +27495,50 @@
    ;
    return 0;
  }
-@@ -23841,18 +24620,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23841,18 +25663,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23837,7 +27563,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23865,17 +24645,17 @@
+@@ -23865,40 +25688,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -23859,7 +27585,50 @@
    ;
    return 0;
  }
-@@ -23907,14 +24687,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23907,14 +25742,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23878,7 +27647,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -23928,18 +24709,19 @@
+@@ -23928,18 +25764,19 @@
  for ac_header in sys/types.h stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -23906,7 +27675,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23976,15 +24758,16 @@
+@@ -23950,24 +25787,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -23976,15 +25825,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23928,7 +27742,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24018,9 +24801,10 @@
+@@ -23993,8 +25843,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -24018,9 +25873,10 @@
  
    ac_header_preproc=no
  fi
@@ -23941,7 +27771,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24044,25 +24828,19 @@
+@@ -24044,25 +25900,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -23974,7 +27804,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24080,18 +24858,19 @@
+@@ -24080,18 +25930,19 @@
  for ac_header in sys/bitypes.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -24002,7 +27832,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24128,15 +24907,16 @@
+@@ -24102,24 +25953,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24128,15 +25991,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24024,7 +27899,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24170,9 +24950,10 @@
+@@ -24145,8 +26009,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -24170,9 +26039,10 @@
  
    ac_header_preproc=no
  fi
@@ -24037,7 +27928,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24196,25 +24977,19 @@
+@@ -24196,25 +26066,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -24070,7 +27961,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24228,8 +25003,8 @@
+@@ -24228,8 +26092,8 @@
  
  
     # darwin requires a poll emulation library
@@ -24081,7 +27972,7 @@
  if test "${ac_cv_lib_poll_poll+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24242,17 +25017,17 @@
+@@ -24242,40 +26106,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -24103,7 +27994,50 @@
    ;
    return 0;
  }
-@@ -24284,14 +25059,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24284,14 +26160,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24122,7 +28056,7 @@
  if test $ac_cv_lib_poll_poll = yes; then
    LIB_POLL="-lpoll"
  fi
-@@ -24302,18 +25078,19 @@
+@@ -24302,18 +26179,19 @@
  for ac_header in Carbon/Carbon.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -24150,7 +28084,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24350,15 +25127,16 @@
+@@ -24324,24 +26202,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24350,15 +26240,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24172,7 +28151,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24392,9 +25170,10 @@
+@@ -24367,8 +26258,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -24392,9 +26288,10 @@
  
    ac_header_preproc=no
  fi
@@ -24185,7 +28180,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24418,25 +25197,19 @@
+@@ -24418,25 +26315,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -24218,7 +28213,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24451,17 +25224,17 @@
+@@ -24451,17 +26342,17 @@
  
     # CoreAudio framework
     if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -24242,7 +28237,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24498,15 +25271,16 @@
+@@ -24472,24 +26363,36 @@
+ #include <CoreAudio/CoreAudio.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24498,15 +26401,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24264,7 +28304,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24540,9 +25314,10 @@
+@@ -24515,8 +26419,13 @@
+ /* end confdefs.h.  */
+ #include <CoreAudio/CoreAudio.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -24540,9 +26449,10 @@
  
    ac_header_preproc=no
  fi
@@ -24277,7 +28333,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24566,25 +25341,18 @@
+@@ -24566,25 +26476,18 @@
  echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
@@ -24308,7 +28364,7 @@
  
  fi
  if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24601,8 +25369,8 @@
+@@ -24601,8 +26504,8 @@
  
  
  
@@ -24319,7 +28375,50 @@
    kde_libs_safe="$LIBS"
    LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
    cat >conftest.$ac_ext <<_ACEOF
-@@ -24651,8 +25419,8 @@
+@@ -24628,31 +26531,43 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
        LIBRESOLV="-lresolv"
@@ -24330,7 +28429,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RES_INIT 1
-@@ -24663,25 +25431,25 @@
+@@ -24663,25 +26578,25 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24362,7 +28461,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24693,9 +25461,6 @@
+@@ -24693,9 +26608,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -24372,7 +28471,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24747,8 +25512,9 @@
+@@ -24721,24 +26633,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24747,8 +26671,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24383,7 +28527,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -24762,11 +25528,11 @@
+@@ -24762,11 +26687,11 @@
  fi
  
  
@@ -24399,7 +28543,7 @@
  if test "${kde_cv_proto_res_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24787,8 +25553,7 @@
+@@ -24787,8 +26712,7 @@
  if test "x$kde_cv_proto_res_init" = xunknown; then
  
  
@@ -24409,7 +28553,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24853,9 +25618,10 @@
+@@ -24826,24 +26750,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24853,9 +26789,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24421,7 +28610,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -24869,8 +25635,8 @@
+@@ -24869,8 +26806,8 @@
  
  fi
  
@@ -24432,7 +28621,7 @@
  
  if test "x$kde_cv_func_res_init" = xyes; then
  
-@@ -24897,8 +25663,8 @@
+@@ -24897,8 +26834,8 @@
     LIBSOCKET="$X_EXTRA_LIBS"
  
  
@@ -24443,7 +28632,7 @@
  if test "${ac_cv_lib_ucb_killpg+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24911,17 +25677,17 @@
+@@ -24911,40 +26848,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -24465,7 +28654,50 @@
    ;
    return 0;
  }
-@@ -24953,27 +25719,28 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -24953,27 +26902,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24503,7 +28735,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24986,17 +25753,17 @@
+@@ -24986,40 +26936,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -24525,7 +28757,50 @@
    ;
    return 0;
  }
-@@ -25028,22 +25795,23 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25028,22 +26990,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24554,7 +28829,7 @@
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25054,12 +25822,13 @@
+@@ -25054,36 +27017,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -24570,7 +28845,51 @@
    return 0;
    ;
    return 0;
-@@ -25092,20 +25861,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25092,20 +27068,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24598,7 +28917,7 @@
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
-@@ -25118,10 +25888,11 @@
+@@ -25118,10 +27095,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -24611,7 +28930,52 @@
  test_array [0] = 0
  
    ;
-@@ -25159,10 +25930,11 @@
+@@ -25129,24 +27107,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25159,10 +27149,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -24624,7 +28988,52 @@
  test_array [0] = 0
  
    ;
-@@ -25196,30 +25968,32 @@
+@@ -25170,24 +27161,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25196,30 +27199,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24665,7 +29074,52 @@
  test_array [0] = 0
  
    ;
-@@ -25257,10 +26031,11 @@
+@@ -25227,24 +27232,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25257,10 +27274,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -24678,7 +29132,52 @@
  test_array [0] = 0
  
    ;
-@@ -25294,23 +26069,26 @@
+@@ -25268,24 +27286,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25294,23 +27324,26 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24712,7 +29211,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25322,10 +26100,11 @@
+@@ -25322,10 +27355,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -24725,7 +29224,52 @@
  test_array [0] = 0
  
    ;
-@@ -25359,26 +26138,20 @@
+@@ -25333,24 +27367,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25359,26 +27405,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24757,7 +29301,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25386,8 +26159,9 @@
+@@ -25386,8 +27426,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -24769,7 +29313,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -25396,22 +26170,22 @@
+@@ -25396,35 +27437,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -24801,7 +29345,33 @@
  
    ;
    return 0;
-@@ -25435,28 +26209,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25435,28 +27485,27 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -24838,7 +29408,7 @@
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25467,12 +26240,13 @@
+@@ -25467,36 +27516,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -24854,7 +29424,51 @@
    return 0;
    ;
    return 0;
-@@ -25505,20 +26279,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25505,20 +27567,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24882,7 +29496,7 @@
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
-@@ -25531,10 +26306,11 @@
+@@ -25531,10 +27594,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -24895,7 +29509,52 @@
  test_array [0] = 0
  
    ;
-@@ -25572,10 +26348,11 @@
+@@ -25542,24 +27606,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25572,10 +27648,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -24908,7 +29567,52 @@
  test_array [0] = 0
  
    ;
-@@ -25609,30 +26386,32 @@
+@@ -25583,24 +27660,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25609,30 +27698,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24949,7 +29653,52 @@
  test_array [0] = 0
  
    ;
-@@ -25670,10 +26449,11 @@
+@@ -25640,24 +27731,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25670,10 +27773,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -24962,7 +29711,52 @@
  test_array [0] = 0
  
    ;
-@@ -25707,23 +26487,26 @@
+@@ -25681,24 +27785,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25707,23 +27823,26 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24996,7 +29790,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -25735,10 +26518,11 @@
+@@ -25735,10 +27854,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25009,7 +29803,52 @@
  test_array [0] = 0
  
    ;
-@@ -25772,26 +26556,20 @@
+@@ -25746,24 +27866,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25772,26 +27904,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25041,7 +29880,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25799,8 +26577,9 @@
+@@ -25799,8 +27925,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25053,7 +29892,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -25809,22 +26588,22 @@
+@@ -25809,35 +27936,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -25085,7 +29924,33 @@
  
    ;
    return 0;
-@@ -25848,28 +26627,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25848,28 +27984,27 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -25122,7 +29987,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25880,12 +26658,13 @@
+@@ -25880,36 +28015,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25138,7 +30003,51 @@
    return 0;
    ;
    return 0;
-@@ -25918,20 +26697,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25918,20 +28066,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25166,7 +30075,7 @@
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
-@@ -25944,10 +26724,11 @@
+@@ -25944,10 +28093,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25179,7 +30088,52 @@
  test_array [0] = 0
  
    ;
-@@ -25985,10 +26766,11 @@
+@@ -25955,24 +28105,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -25985,10 +28147,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25192,7 +30146,52 @@
  test_array [0] = 0
  
    ;
-@@ -26022,30 +26804,32 @@
+@@ -25996,24 +28159,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26022,30 +28197,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25233,7 +30232,52 @@
  test_array [0] = 0
  
    ;
-@@ -26083,10 +26867,11 @@
+@@ -26053,24 +28230,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26083,10 +28272,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25246,7 +30290,52 @@
  test_array [0] = 0
  
    ;
-@@ -26120,23 +26905,26 @@
+@@ -26094,24 +28284,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26120,23 +28322,26 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25280,7 +30369,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26148,10 +26936,11 @@
+@@ -26148,10 +28353,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25293,7 +30382,52 @@
  test_array [0] = 0
  
    ;
-@@ -26185,26 +26974,20 @@
+@@ -26159,24 +28365,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26185,26 +28403,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25325,7 +30459,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26212,8 +26995,9 @@
+@@ -26212,8 +28424,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25337,7 +30471,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -26222,22 +27006,22 @@
+@@ -26222,35 +28435,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -25369,7 +30503,33 @@
  
    ;
    return 0;
-@@ -26261,28 +27045,27 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26261,28 +28483,27 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -25406,7 +30566,7 @@
  if test "${ac_cv_type_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26293,12 +27076,13 @@
+@@ -26293,36 +28514,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25422,7 +30582,51 @@
    return 0;
    ;
    return 0;
-@@ -26331,20 +27115,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26331,20 +28565,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25450,7 +30654,7 @@
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
-@@ -26357,10 +27142,11 @@
+@@ -26357,10 +28592,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25463,7 +30667,52 @@
  test_array [0] = 0
  
    ;
-@@ -26398,10 +27184,11 @@
+@@ -26368,24 +28604,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26398,10 +28646,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25476,7 +30725,52 @@
  test_array [0] = 0
  
    ;
-@@ -26435,30 +27222,32 @@
+@@ -26409,24 +28658,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26435,30 +28696,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25517,7 +30811,52 @@
  test_array [0] = 0
  
    ;
-@@ -26496,10 +27285,11 @@
+@@ -26466,24 +28729,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26496,10 +28771,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25530,7 +30869,52 @@
  test_array [0] = 0
  
    ;
-@@ -26533,23 +27323,26 @@
+@@ -26507,24 +28783,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26533,23 +28821,26 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25564,7 +30948,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -26561,10 +27354,11 @@
+@@ -26561,10 +28852,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25577,7 +30961,52 @@
  test_array [0] = 0
  
    ;
-@@ -26598,26 +27392,20 @@
+@@ -26572,24 +28864,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26598,26 +28902,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25609,7 +31038,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26625,8 +27413,9 @@
+@@ -26625,8 +28923,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25621,7 +31050,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -26635,22 +27424,22 @@
+@@ -26635,35 +28934,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -25653,7 +31082,33 @@
  
    ;
    return 0;
-@@ -26674,30 +27463,29 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26674,30 +28982,29 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -25692,7 +31147,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26710,17 +27498,17 @@
+@@ -26710,40 +29017,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -25714,7 +31169,50 @@
    ;
    return 0;
  }
-@@ -26752,14 +27540,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26752,14 +29071,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25733,7 +31231,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
  
  LIBDL="-ldl"
-@@ -26768,8 +27557,8 @@
+@@ -26768,8 +29088,8 @@
  fi
  
  
@@ -25744,7 +31242,7 @@
  if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26782,17 +27571,17 @@
+@@ -26782,40 +29102,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -25766,7 +31264,50 @@
    ;
    return 0;
  }
-@@ -26824,14 +27613,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26824,14 +29156,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25785,7 +31326,7 @@
  if test $ac_cv_lib_dld_shl_unload = yes; then
  
  LIBDL="-ldld"
-@@ -26845,8 +27635,8 @@
+@@ -26845,8 +29178,8 @@
  
  
  
@@ -25796,7 +31337,7 @@
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26857,12 +27647,13 @@
+@@ -26857,36 +29190,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25812,7 +31353,51 @@
    return 0;
    ;
    return 0;
-@@ -26895,20 +27686,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26895,20 +29241,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25840,7 +31425,7 @@
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
-@@ -26921,10 +27713,11 @@
+@@ -26921,10 +29268,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25853,7 +31438,52 @@
  test_array [0] = 0
  
    ;
-@@ -26962,10 +27755,11 @@
+@@ -26932,24 +29280,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26962,10 +29322,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25866,7 +31496,52 @@
  test_array [0] = 0
  
    ;
-@@ -26999,30 +27793,32 @@
+@@ -26973,24 +29334,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -26999,30 +29372,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25907,7 +31582,52 @@
  test_array [0] = 0
  
    ;
-@@ -27060,10 +27856,11 @@
+@@ -27030,24 +29405,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27060,10 +29447,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25920,7 +31640,52 @@
  test_array [0] = 0
  
    ;
-@@ -27097,23 +27894,26 @@
+@@ -27071,24 +29459,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27097,23 +29497,26 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25954,7 +31719,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27125,10 +27925,11 @@
+@@ -27125,10 +29528,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -25967,7 +31732,52 @@
  test_array [0] = 0
  
    ;
-@@ -27162,26 +27963,20 @@
+@@ -27136,24 +29540,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27162,26 +29578,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -25999,7 +31809,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27189,8 +27984,9 @@
+@@ -27189,8 +29599,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -26011,7 +31821,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -27199,22 +27995,22 @@
+@@ -27199,35 +29610,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -26043,7 +31853,33 @@
  
    ;
    return 0;
-@@ -27238,29 +28034,28 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27238,29 +29658,28 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -26081,7 +31917,7 @@
  if test "${ac_cv_type_unsigned_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -27271,12 +28066,13 @@
+@@ -27271,36 +29690,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -26097,7 +31933,51 @@
    return 0;
    ;
    return 0;
-@@ -27309,20 +28105,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27309,20 +29741,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26125,7 +32005,7 @@
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
-@@ -27335,10 +28132,11 @@
+@@ -27335,10 +29768,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -26138,7 +32018,52 @@
  test_array [0] = 0
  
    ;
-@@ -27376,10 +28174,11 @@
+@@ -27346,24 +29780,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27376,10 +29822,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -26151,7 +32076,52 @@
  test_array [0] = 0
  
    ;
-@@ -27413,30 +28212,32 @@
+@@ -27387,24 +29834,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27413,30 +29872,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26192,7 +32162,52 @@
  test_array [0] = 0
  
    ;
-@@ -27474,10 +28275,11 @@
+@@ -27444,24 +29905,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27474,10 +29947,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -26205,7 +32220,52 @@
  test_array [0] = 0
  
    ;
-@@ -27511,23 +28313,26 @@
+@@ -27485,24 +29959,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27511,23 +29997,26 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26239,7 +32299,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -27539,10 +28344,11 @@
+@@ -27539,10 +30028,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -26252,7 +32312,52 @@
  test_array [0] = 0
  
    ;
-@@ -27576,26 +28382,20 @@
+@@ -27550,24 +30040,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27576,26 +30078,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26284,7 +32389,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27603,8 +28403,9 @@
+@@ -27603,8 +30099,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -26296,7 +32401,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -27613,22 +28414,22 @@
+@@ -27613,35 +30110,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -26328,7 +32433,33 @@
  
    ;
    return 0;
-@@ -27652,30 +28453,29 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27652,30 +30158,29 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -26367,9 +32498,50 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27717,15 +28517,15 @@
+@@ -27696,36 +30201,48 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
@@ -26387,7 +32559,7 @@
        { { echo "$as_me:$LINENO: error:
         Apparently on your system our assumption sizeof size_t == sizeof unsigned long
         does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27737,18 +28537,18 @@
+@@ -27737,18 +30254,18 @@
     { (exit 1); exit 1; }; }
  
  fi
@@ -26410,7 +32582,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27804,8 +28604,9 @@
+@@ -27778,24 +30295,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27804,8 +30333,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26421,7 +32638,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -27819,26 +28620,26 @@
+@@ -27819,26 +30349,26 @@
  
  
  fi
@@ -26458,7 +32675,7 @@
  
    KDE_USE_FPIE=""
    KDE_USE_PIE=""
-@@ -27857,18 +28658,19 @@
+@@ -27857,18 +30387,19 @@
  for ac_header in crt_externs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -26486,7 +32703,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27905,15 +28707,16 @@
+@@ -27879,24 +30410,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -27905,15 +30448,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26508,7 +32770,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27947,9 +28750,10 @@
+@@ -27922,8 +30466,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -27947,9 +30496,10 @@
  
    ac_header_preproc=no
  fi
@@ -26521,7 +32799,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27973,25 +28777,19 @@
+@@ -27973,25 +30523,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -26554,7 +32832,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -28003,8 +28801,8 @@
+@@ -28003,8 +30547,8 @@
  
  done
  
@@ -26565,7 +32843,7 @@
  if test "${ac_cv_func__NSGetEnviron+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28031,30 +28829,24 @@
+@@ -28031,53 +30575,59 @@
  
  #undef _NSGetEnviron
  
@@ -26601,7 +32879,50 @@
    ;
    return 0;
  }
-@@ -28086,13 +28878,14 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28086,13 +30636,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26619,7 +32940,7 @@
  if test $ac_cv_func__NSGetEnviron = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -28113,9 +28906,9 @@
+@@ -28113,9 +30664,9 @@
  for ac_func in vsnprintf snprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -26632,7 +32953,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -28141,30 +28934,24 @@
+@@ -28141,53 +30692,59 @@
  
  #undef $ac_func
  
@@ -26668,7 +32989,50 @@
    ;
    return 0;
  }
-@@ -28196,13 +28983,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28196,13 +30753,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26687,7 +33051,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28219,32 +29008,32 @@
+@@ -28219,32 +30778,32 @@
  
  
  
@@ -26732,7 +33096,7 @@
  
  # used to disable x11-specific stuff on special platforms
  
-@@ -28260,8 +29049,8 @@
+@@ -28260,8 +30819,8 @@
  
  if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
  
@@ -26743,7 +33107,23 @@
  
  if test "${kde_cv_have_x+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28366,6 +29155,7 @@
+@@ -28298,8 +30857,13 @@
+ /* end confdefs.h.  */
+ #include <$x_direct_test_include>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -28366,6 +30930,7 @@
      fi
    done
  fi
@@ -26751,7 +33131,52 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = NO
  
-@@ -28423,7 +29213,7 @@
+@@ -28395,24 +30960,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28423,7 +31000,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26760,7 +33185,7 @@
  # First see if replacing the include by lib works.
  # Check X11 before X11Rn because it is often a symlink to the current release.
  for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28471,6 +29261,7 @@
+@@ -28471,6 +31048,7 @@
    done
  done
  fi
@@ -26768,7 +33193,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = NO
-@@ -28481,7 +29272,7 @@
+@@ -28481,21 +31059,26 @@
  *-*-solaris*)
    ;;
  *)
@@ -26776,15 +33201,24 @@
 +  rm -f -r conftest.dir
  if mkdir conftest.dir; then
    cd conftest.dir
-   # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-@@ -28489,13 +29280,13 @@
- acfindx:
- 	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+   cat >Imakefile <<'_ACEOF'
+-acfindx:
+-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
++incroot:
++	@echo incroot='${INCROOT}'
++usrlibdir:
++	@echo usrlibdir='${USRLIBDIR}'
++libdir:
++	@echo libdir='${LIBDIR}'
  _ACEOF
 -  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
 +  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
      # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-     eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
++    for ac_var in incroot usrlibdir libdir; do
++      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
++    done
      # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
      for ac_extension in a so sl; do
 -      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
@@ -26794,7 +33228,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -28503,7 +29294,7 @@
+@@ -28503,7 +31086,7 @@
      # bogus both because they are the default anyway, and because
      # using them would break gcc on systems where it needs fixed includes.
      case $ac_im_incroot in
@@ -26803,7 +33237,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -28512,7 +29303,7 @@
+@@ -28512,7 +31095,7 @@
      esac
    fi
    cd ..
@@ -26812,7 +33246,7 @@
  fi
  
    if test -z "$ac_x_includes"; then
-@@ -28556,12 +29347,12 @@
+@@ -28556,12 +31139,12 @@
  eval "$kde_cv_have_x"
  
  if test "$have_x" != yes; then
@@ -26829,7 +33263,7 @@
  fi
  
  if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28589,8 +29380,8 @@
+@@ -28589,8 +31172,8 @@
  # These have to be linked with before -lX11, unlike the other
  # libraries we check for below, so use a different variable.
  #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
@@ -26840,7 +33274,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28603,17 +29394,17 @@
+@@ -28603,40 +31186,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26862,7 +33296,50 @@
    ;
    return 0;
  }
-@@ -28645,14 +29436,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28645,14 +31240,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26881,7 +33358,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    LIBSM="-lSM -lICE"
  fi
-@@ -28661,8 +29453,8 @@
+@@ -28661,8 +31257,8 @@
  
  LIB_X11='-lX11 $(LIBSOCKET)'
  
@@ -26892,7 +33369,52 @@
  if test "${kde_cv_have_libXext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28722,9 +29514,10 @@
+@@ -28696,24 +31292,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28722,9 +31330,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26904,7 +33426,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -28734,8 +29527,8 @@
+@@ -28734,8 +31343,8 @@
  fi
  
  
@@ -26915,7 +33437,7 @@
  
  if test "$kde_cv_have_libXext" = "no"; then
    { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28881,8 +29674,8 @@
+@@ -28881,8 +31490,8 @@
      else
        PTHREAD_LIBS_save="$PTHREAD_LIBS"
        PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -26926,7 +33448,7 @@
  
       kde_save_LDFLAGS="$LDFLAGS"
            kde_save_LIBS="$LIBS"
-@@ -28893,9 +29686,9 @@
+@@ -28893,9 +31502,9 @@
  	;;
       esac
       as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -26939,7 +33461,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -28907,17 +29700,17 @@
+@@ -28907,40 +31516,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26961,7 +33483,50 @@
    ;
    return 0;
  }
-@@ -28949,14 +29742,16 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -28949,14 +31570,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26981,7 +33546,7 @@
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
    LIBPTHREAD="$PTHREAD_LIBS_save"
  fi
-@@ -28969,8 +29764,8 @@
+@@ -28969,8 +31592,8 @@
    fi
  
      if test -z "$LIBPTHREAD"; then
@@ -26992,7 +33557,7 @@
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28983,17 +29778,17 @@
+@@ -28983,40 +31606,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27014,7 +33579,50 @@
    ;
    return 0;
  }
-@@ -29025,14 +29820,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29025,14 +31660,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27033,7 +33641,7 @@
  if test $ac_cv_lib_pthread_pthread_create = yes; then
    LIBPTHREAD="-lpthread"
  fi
-@@ -29040,8 +29836,8 @@
+@@ -29040,8 +31676,8 @@
    fi
  
      if test -z "$LIBPTHREAD" ; then
@@ -27044,8 +33652,50 @@
      kde_safe_libs=$LIBS
      LIBS="$LIBS -lpthread"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -29082,17 +29878,18 @@
+@@ -29060,39 +31696,52 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
 -        echo "$as_me:$LINENO: result: yes" >&5
@@ -27067,7 +33717,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
      LIBS=$kde_safe_libs
-@@ -29108,16 +29905,15 @@
+@@ -29108,16 +31757,15 @@
        USE_THREADS=""
        if test -z "$LIBPTHREAD"; then
  
@@ -27088,7 +33738,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29170,7 +29966,9 @@
+@@ -29144,24 +31792,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29170,7 +31830,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27098,7 +33793,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -29184,13 +29982,13 @@
+@@ -29184,13 +31846,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -27116,7 +33811,7 @@
   :
  
  fi
-@@ -29202,16 +30000,15 @@
+@@ -29202,16 +31864,15 @@
      case $host_os in
   	solaris*)
  
@@ -27137,7 +33832,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29264,7 +30061,9 @@
+@@ -29238,24 +31899,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29264,7 +31937,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27147,7 +33887,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -29278,13 +30077,13 @@
+@@ -29278,13 +31953,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -27165,7 +33905,7 @@
   :
  
  fi
-@@ -29311,17 +30110,17 @@
+@@ -29311,17 +31986,17 @@
  
  
  
@@ -27189,7 +33929,7 @@
  kde_extra_includes=
  if test -n "$kde_use_extra_includes" && \
     test "$kde_use_extra_includes" != "NONE"; then
-@@ -29339,21 +30138,21 @@
+@@ -29339,21 +32014,21 @@
  fi
  
  
@@ -27219,7 +33959,7 @@
  if test -n "$kde_use_extra_libs" && \
     test "$kde_use_extra_libs" != "NONE"; then
  
-@@ -29372,14 +30171,14 @@
+@@ -29372,14 +32047,14 @@
  
  
  
@@ -27238,7 +33978,52 @@
  if test "${ac_cv_lib_z+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29439,8 +30238,9 @@
+@@ -29413,24 +32088,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29439,8 +32126,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27249,7 +34034,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
-@@ -29454,8 +30254,8 @@
+@@ -29454,8 +32142,8 @@
  _ACEOF
  
    LIBZ="$ac_cv_lib_z"
@@ -27260,7 +34045,7 @@
  else
    { { echo "$as_me:$LINENO: error: not found.
            Possibly configure picks up an outdated version
-@@ -29475,8 +30275,8 @@
+@@ -29475,8 +32163,8 @@
  
  
  
@@ -27271,7 +34056,52 @@
  if test "${ac_cv_lib_png+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29538,9 +30338,10 @@
+@@ -29512,24 +32200,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29538,9 +32238,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27283,7 +34113,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
-@@ -29555,19 +30356,19 @@
+@@ -29555,19 +32256,19 @@
  
    LIBPNG="$ac_cv_lib_png"
  
@@ -27309,7 +34139,52 @@
  if test "${ac_cv_lib_jpeg_6b+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29626,8 +30427,9 @@
+@@ -29600,24 +32301,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29626,8 +32339,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27320,7 +34195,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -29638,14 +30440,14 @@
+@@ -29638,14 +32352,14 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -27341,7 +34216,52 @@
  if test "${ac_cv_lib_jpeg_normal+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29704,8 +30506,9 @@
+@@ -29678,24 +32392,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -29704,8 +32430,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27352,7 +34272,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -29716,11 +30519,11 @@
+@@ -29716,11 +32443,11 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -27368,16 +34288,16 @@
  
         LIBJPEG=
  
-@@ -29740,7 +30543,7 @@
+@@ -29740,7 +32467,7 @@
  do
    for j in jpeglib.h;
    do
 -    echo "configure: 29743: $i/$j" >&5
-+    echo "configure: 30546: $i/$j" >&5
++    echo "configure: 32470: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29787,14 +30590,14 @@
+@@ -29787,14 +32514,14 @@
  
  
  
@@ -27395,7 +34315,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -29837,8 +30640,8 @@
+@@ -29837,8 +32564,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27406,7 +34326,7 @@
  
  		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
  We need perl to generate some code." >&5
-@@ -29847,8 +30650,8 @@
+@@ -29847,8 +32574,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -27417,7 +34337,7 @@
        PERL=$kde_cv_path
  
     fi
-@@ -29862,10 +30665,9 @@
+@@ -29862,10 +32589,9 @@
  
  
  
@@ -27430,7 +34350,7 @@
  else
  
      if test $kde_qtver = 3; then
-@@ -29875,7 +30677,8 @@
+@@ -29875,7 +32601,8 @@
      fi
  
  
@@ -27440,7 +34360,7 @@
  
  USING_QT_MT=""
  
-@@ -29895,13 +30698,13 @@
+@@ -29895,13 +32622,13 @@
    else
      kde_check_threading_default=yes
    fi
@@ -27458,7 +34378,7 @@
    if test "x$kde_use_threading" = "xyes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -29973,8 +30776,8 @@
+@@ -29973,8 +32700,8 @@
    LIBQT="$LIBQT $LIBDL"
  fi
  
@@ -27469,7 +34389,7 @@
  
  if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
  LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29983,34 +30786,34 @@
+@@ -29983,34 +32710,34 @@
  qt_libraries=""
  qt_includes=""
  
@@ -27516,16 +34436,16 @@
  
  if test "${ac_cv_have_qt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30038,7 +30841,7 @@
+@@ -30038,7 +32765,7 @@
  do
    for j in $kde_qt_header;
    do
 -    echo "configure: 30041: $i/$j" >&5
-+    echo "configure: 30844: $i/$j" >&5
++    echo "configure: 32768: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30075,8 +30878,7 @@
+@@ -30075,8 +32802,7 @@
  ac_qt_libraries="$qt_libdir"
  
  
@@ -27535,7 +34455,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30213,13 +31015,13 @@
+@@ -30213,13 +32939,13 @@
  eval "$ac_cv_have_qt"
  
  if test "$have_qt" != yes; then
@@ -27553,7 +34473,7 @@
  
    qt_libraries="$ac_qt_libraries"
    qt_includes="$ac_qt_includes"
-@@ -30228,15 +31030,14 @@
+@@ -30228,15 +32954,14 @@
  if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
  
  
@@ -27572,7 +34492,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30357,12 +31158,12 @@
+@@ -30357,12 +33082,12 @@
  
  
  if test "$kde_cv_qt_direct" = "yes"; then
@@ -27589,7 +34509,7 @@
  
  fi
  
-@@ -30400,14 +31201,14 @@
+@@ -30400,14 +33125,14 @@
     fi
  
  
@@ -27607,7 +34527,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30450,8 +31251,8 @@
+@@ -30450,8 +33175,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27618,7 +34538,7 @@
  
      { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
  Please check whether you installed Qt correctly.
-@@ -30472,22 +31273,22 @@
+@@ -30472,22 +33197,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -27646,7 +34566,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30530,12 +31331,12 @@
+@@ -30530,12 +33255,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -27663,7 +34583,7 @@
        UIC_PATH=$kde_cv_path
  
     fi
-@@ -30565,10 +31366,10 @@
+@@ -30565,10 +33290,10 @@
  
         if test $kde_qtver = 3; then
  
@@ -27677,7 +34597,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30591,22 +31392,22 @@
+@@ -30591,22 +33316,22 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -27707,7 +34627,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30629,13 +31430,13 @@
+@@ -30629,13 +33354,13 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -27725,7 +34645,7 @@
          :
          ac_uic_supports_nounload=no
      fi
-@@ -30666,15 +31467,14 @@
+@@ -30666,15 +33391,14 @@
  
  
  if test -n "$LIBJPEG"; then
@@ -27744,7 +34664,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30733,8 +31533,9 @@
+@@ -30707,24 +33431,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -30733,8 +33469,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27755,7 +34720,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
-@@ -30751,12 +31552,12 @@
+@@ -30751,12 +33488,12 @@
  
  
  if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -27772,7 +34737,7 @@
    LIBJPEG_QT=
  fi
  
-@@ -30787,15 +31588,15 @@
+@@ -30787,15 +33524,15 @@
  
  
  
@@ -27794,7 +34759,7 @@
  
  if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
  
-@@ -30819,11 +31620,11 @@
+@@ -30819,11 +33556,11 @@
  
  
  
@@ -27810,34 +34775,34 @@
  
  if test "${prefix}" != NONE; then
    kde_includes=${includedir}
-@@ -30875,7 +31676,7 @@
+@@ -30875,7 +33612,7 @@
  do
    for j in $kde_check_header;
    do
 -    echo "configure: 30878: $i/$j" >&5
-+    echo "configure: 31679: $i/$j" >&5
++    echo "configure: 33615: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30905,7 +31706,7 @@
+@@ -30905,7 +33642,7 @@
  do
    for j in $kde_check_lib;
    do
 -    echo "configure: 30908: $i/$j" >&5
-+    echo "configure: 31709: $i/$j" >&5
++    echo "configure: 33645: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30923,7 +31724,7 @@
+@@ -30923,7 +33660,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
 -    echo "configure: 30926: $i/$j" >&5
-+    echo "configure: 31727: $i/$j" >&5
++    echo "configure: 33663: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -30982,12 +31783,12 @@
+@@ -30982,12 +33719,12 @@
   fi
   if test "$exec_prefix" = NONE; then
    ac_kde_exec_prefix="$ac_kde_prefix"
@@ -27854,7 +34819,7 @@
   fi
  
   kde_libraries="${libdir}"
-@@ -30996,8 +31797,8 @@
+@@ -30996,8 +33733,8 @@
  else
    ac_cv_have_kde="have_kde=yes \
      ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -27865,7 +34830,7 @@
  
    kde_libraries="$ac_kde_libraries"
    kde_includes="$ac_kde_includes"
-@@ -31035,8 +31836,8 @@
+@@ -31035,8 +33772,8 @@
  
  if test x$ac_uic_supports_libpath = xyes; then
  
@@ -27876,7 +34841,7 @@
  if test "${kde_cv_uic_plugins+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -31079,8 +31880,8 @@
+@@ -31079,8 +33816,8 @@
  fi
  
  
@@ -27887,7 +34852,7 @@
  if test "$kde_cv_uic_plugins" != yes; then
  	{ { echo "$as_me:$LINENO: error:
  you need to install kdelibs first.
-@@ -31112,10 +31913,9 @@
+@@ -31112,10 +33849,9 @@
  
  
  
@@ -27900,7 +34865,7 @@
    if test "$enableval" = "no";
      then ac_use_path_checking="default"
      else ac_use_path_checking=""
-@@ -31129,13 +31929,14 @@
+@@ -31129,13 +33865,14 @@
    fi
  
  
@@ -27918,7 +34883,7 @@
  kde_result=""
  kde_cached_paths=yes
  if test "${kde_cv_all_paths+set}" = set; then
-@@ -31246,15 +32047,14 @@
+@@ -31246,15 +33983,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -27939,7 +34904,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31306,8 +32106,8 @@
+@@ -31306,8 +34042,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -27950,7 +34915,7 @@
   else
     { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
  Check, if you installed the KDE header files correctly.
-@@ -31346,8 +32146,8 @@
+@@ -31346,8 +34082,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -27961,7 +34926,7 @@
  ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
  
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31355,8 +32155,8 @@
+@@ -31355,8 +34091,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -27972,7 +34937,7 @@
  else
    { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
  Check, if your compiler is installed correctly and if you have used the
-@@ -31549,15 +32349,14 @@
+@@ -31549,15 +34285,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -27993,7 +34958,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31609,8 +32408,8 @@
+@@ -31609,8 +34344,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -28004,7 +34969,7 @@
   else
     { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
  Check, if you installed the KDE header files correctly.
-@@ -31649,8 +32448,8 @@
+@@ -31649,8 +34384,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -28015,7 +34980,7 @@
  ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
  
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31658,8 +32457,8 @@
+@@ -31658,8 +34393,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -28026,7 +34991,7 @@
  else
    { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
  Check, if your compiler is installed correctly and if you have used the
-@@ -31751,22 +32550,22 @@
+@@ -31751,22 +34486,22 @@
     { (exit 1); exit 1; }; }
  else
    rm -f conftest*
@@ -28055,7 +35020,7 @@
  
  
  if test "$build_arts" '!=' "no"; then
-@@ -31799,14 +32598,14 @@
+@@ -31799,14 +34534,14 @@
  
          kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
  
@@ -28073,7 +35038,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31849,8 +32648,8 @@
+@@ -31849,8 +34584,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28084,7 +35049,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
  Please check whether you installed KDE correctly.
-@@ -31861,21 +32660,21 @@
+@@ -31861,21 +34596,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -28111,7 +35076,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31918,8 +32717,8 @@
+@@ -31918,8 +34653,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28122,7 +35087,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
  Please check whether you installed KDE correctly.
-@@ -31930,22 +32729,22 @@
+@@ -31930,22 +34665,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -28150,7 +35115,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31988,8 +32787,8 @@
+@@ -31988,8 +34723,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28161,7 +35126,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
  Please check whether you installed aRts correctly or use
-@@ -32002,21 +32801,21 @@
+@@ -32002,21 +34737,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -28188,7 +35153,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32059,8 +32858,8 @@
+@@ -32059,8 +34794,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28199,7 +35164,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
  Please check whether you installed aRts correctly or use
-@@ -32073,22 +32872,22 @@
+@@ -32073,22 +34808,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -28227,7 +35192,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32131,12 +32930,12 @@
+@@ -32131,12 +34866,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28244,7 +35209,7 @@
        MEINPROC=$kde_cv_path
  
     fi
-@@ -32165,14 +32964,14 @@
+@@ -32165,14 +34900,14 @@
  
          if test -n "$kde32ornewer"; then
  
@@ -28262,7 +35227,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32215,8 +33014,8 @@
+@@ -32215,8 +34950,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28273,7 +35238,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
  Please check whether you installed KDE correctly.
-@@ -32227,21 +33026,21 @@
+@@ -32227,21 +34962,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -28300,7 +35265,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32284,8 +33083,8 @@
+@@ -32284,8 +35019,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28311,7 +35276,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
  Please check whether you installed KDE correctly.
-@@ -32296,8 +33095,8 @@
+@@ -32296,8 +35031,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -28322,7 +35287,7 @@
        DCOPIDLNG=$kde_cv_path
  
     fi
-@@ -32305,14 +33104,14 @@
+@@ -32305,14 +35040,14 @@
          fi
          if test -n "$kde33ornewer"; then
  
@@ -28340,7 +35305,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32355,8 +33154,8 @@
+@@ -32355,8 +35090,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28351,7 +35316,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
  Please check whether you installed KDE correctly.
-@@ -32367,8 +33166,8 @@
+@@ -32367,8 +35102,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -28362,7 +35327,7 @@
        MAKEKDEWIDGETS=$kde_cv_path
  
     fi
-@@ -32376,14 +33175,14 @@
+@@ -32376,14 +35111,14 @@
  
          fi
  
@@ -28380,7 +35345,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32426,12 +33225,12 @@
+@@ -32426,12 +35161,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -28397,16 +35362,16 @@
        XMLLINT=$kde_cv_path
  
     fi
-@@ -32446,7 +33245,7 @@
+@@ -32446,7 +35181,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
 -    echo "configure: 32449: $i/$j" >&5
-+    echo "configure: 33248: $i/$j" >&5
++    echo "configure: 35184: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32608,13 +33407,12 @@
+@@ -32608,13 +35343,12 @@
  
  
  
@@ -28423,7 +35388,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32635,13 +33433,13 @@
+@@ -32635,13 +35369,13 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "GCC visibility push" >/dev/null 2>&1; then
  
@@ -28441,7 +35406,7 @@
        { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
                     visibility support. Disabling -fvisibility=hidden" >&5
  echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-@@ -32661,16 +33459,15 @@
+@@ -32661,16 +35395,15 @@
  
      kde_have_gcc_visibility=no
  
@@ -28462,7 +35427,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32723,7 +33520,9 @@
+@@ -32697,24 +35430,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -32723,7 +35468,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28472,7 +35482,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -32737,28 +33536,27 @@
+@@ -32737,28 +35484,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -28510,7 +35520,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32819,8 +33617,9 @@
+@@ -32793,24 +35539,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -32819,8 +35577,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28521,7 +35576,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
            CXXFLAGS=$safe_CXXFLAGS
-@@ -32833,21 +33632,20 @@
+@@ -32833,21 +35592,20 @@
  
  
  fi
@@ -28548,7 +35603,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32913,8 +33711,9 @@
+@@ -32887,24 +35645,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -32913,8 +35683,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28559,7 +35659,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -32929,8 +33728,8 @@
+@@ -32929,8 +35700,8 @@
  
  
  fi
@@ -28570,7 +35670,7 @@
  
      if test x$kde_cv_val_gcc_visibility_bug = xno; then
        CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32946,8 +33745,8 @@
+@@ -32946,8 +35717,8 @@
        fi
  
  else
@@ -28581,7 +35681,7 @@
   :
  
  fi
-@@ -32960,10 +33759,9 @@
+@@ -32960,10 +35731,9 @@
  
    want_pam=
  
@@ -28594,7 +35694,7 @@
          want_pam=yes
          pam_service=kde
        elif test "x$withval" = "xno"; then
-@@ -32975,13 +33773,14 @@
+@@ -32975,13 +35745,14 @@
  
  else
     pam_service=kde
@@ -28612,7 +35712,7 @@
  if test "${ac_cv_lib_pam_pam_start+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -32994,17 +33793,17 @@
+@@ -32994,40 +35765,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28634,7 +35734,50 @@
    ;
    return 0;
  }
-@@ -33036,28 +33835,29 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33036,28 +35819,29 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28673,7 +35816,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33094,15 +33894,16 @@
+@@ -33068,24 +35852,36 @@
+ #include <security/pam_appl.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33094,15 +35890,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28695,7 +35883,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33136,9 +33937,10 @@
+@@ -33111,8 +35908,13 @@
+ /* end confdefs.h.  */
+ #include <security/pam_appl.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -33136,9 +35938,10 @@
  
    ac_header_preproc=no
  fi
@@ -28708,7 +35912,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33162,42 +33964,35 @@
+@@ -33162,42 +35965,35 @@
  echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;}
@@ -28762,7 +35966,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33234,15 +34029,16 @@
+@@ -33208,24 +36004,36 @@
+ #include <pam/pam_appl.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33234,15 +36042,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28784,7 +36033,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33276,9 +34072,10 @@
+@@ -33251,8 +36060,13 @@
+ /* end confdefs.h.  */
+ #include <pam/pam_appl.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -33276,9 +36090,10 @@
  
    ac_header_preproc=no
  fi
@@ -28797,7 +36062,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33302,25 +34099,18 @@
+@@ -33302,25 +36117,18 @@
  echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: pam/pam_appl.h: in the future, the compiler will take precedence" >&2;}
@@ -28828,7 +36093,7 @@
  
  fi
  if test $ac_cv_header_pam_pam_appl_h = yes; then
-@@ -33367,8 +34157,8 @@
+@@ -33367,8 +36175,8 @@
  
        fi
  
@@ -28839,7 +36104,7 @@
        cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33391,11 +34181,11 @@
+@@ -33391,11 +36199,11 @@
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "const struct pam_message" >/dev/null 2>&1; then
@@ -28855,7 +36120,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define PAM_MESSAGE_NONCONST 1
-@@ -33406,8 +34196,8 @@
+@@ -33406,8 +36214,8 @@
  rm -f conftest*
  
  else
@@ -28866,7 +36131,7 @@
  fi
  rm -f conftest*
  
-@@ -33419,8 +34209,8 @@
+@@ -33419,8 +36227,8 @@
  
  
  
@@ -28877,7 +36142,7 @@
  if test "${ac_cv_lib_shadow_getspent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33433,17 +34223,17 @@
+@@ -33433,40 +36241,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28899,7 +36164,50 @@
    ;
    return 0;
  }
-@@ -33475,21 +34265,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33475,21 +36295,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28927,7 +36235,7 @@
  if test "${ac_cv_lib_gen_getspent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33502,17 +34293,17 @@
+@@ -33502,40 +36323,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28949,7 +36257,50 @@
    ;
    return 0;
  }
-@@ -33544,21 +34335,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33544,21 +36377,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28977,7 +36328,7 @@
  if test "${ac_cv_func_getspent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33585,30 +34377,24 @@
+@@ -33585,53 +36419,59 @@
  
  #undef getspent
  
@@ -29013,7 +36364,50 @@
    ;
    return 0;
  }
-@@ -33640,13 +34426,14 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33640,13 +36480,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29031,7 +36425,7 @@
  if test $ac_cv_func_getspent = yes; then
     ac_use_shadow=yes
  else
-@@ -33662,14 +34449,13 @@
+@@ -33662,14 +36503,13 @@
  
  
  
@@ -29050,7 +36444,7 @@
          use_shadow=yes
        else
          use_shadow=no
-@@ -33679,19 +34465,20 @@
+@@ -33679,19 +36519,20 @@
  
        use_shadow="$ac_use_shadow"
  
@@ -29076,7 +36470,7 @@
      LIBSHADOW=
      LIBGEN=
    fi
-@@ -33731,10 +34518,9 @@
+@@ -33731,10 +36572,9 @@
  
  
  
@@ -29089,7 +36483,7 @@
          KDM_PAM_SERVICE=$withval
        else
          { { echo "$as_me:$LINENO: error: Cannot use use --with-kdm-pam, as no PAM was detected.
-@@ -33749,10 +34535,11 @@
+@@ -33749,10 +36589,11 @@
          KDM_PAM_SERVICE="$pam_service"
        fi
  
@@ -29104,7 +36498,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KDM_PAM_SERVICE "$KDM_PAM_SERVICE"
-@@ -33763,10 +34550,9 @@
+@@ -33763,10 +36604,9 @@
  
  
  
@@ -29117,7 +36511,7 @@
          KCHECKPASS_PAM_SERVICE=$withval
        else
          { { echo "$as_me:$LINENO: error: Cannot use use --with-kcp-pam, as no PAM was detected.
-@@ -33781,10 +34567,11 @@
+@@ -33781,10 +36621,11 @@
          KCHECKPASS_PAM_SERVICE="$pam_service"
        fi
  
@@ -29132,7 +36526,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KCHECKPASS_PAM_SERVICE "$KCHECKPASS_PAM_SERVICE"
-@@ -33795,10 +34582,9 @@
+@@ -33795,10 +36636,9 @@
  
  
  
@@ -29145,7 +36539,7 @@
          KSCREENSAVER_PAM_SERVICE=$withval
        else
          { { echo "$as_me:$LINENO: error: Cannot use use --with-kss-pam, as no PAM was detected.
-@@ -33813,10 +34599,11 @@
+@@ -33813,10 +36653,11 @@
          KSCREENSAVER_PAM_SERVICE="$pam_service"
        fi
  
@@ -29160,7 +36554,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KSCREENSAVER_PAM_SERVICE "$KSCREENSAVER_PAM_SERVICE"
-@@ -33834,9 +34621,9 @@
+@@ -33834,9 +36675,9 @@
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -29173,7 +36567,52 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -33884,12 +34671,14 @@
+@@ -33858,24 +36699,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -33884,12 +36737,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29191,7 +36630,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -33901,13 +34690,12 @@
+@@ -33901,13 +36756,12 @@
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
@@ -29207,7 +36646,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33915,77 +34703,29 @@
+@@ -33915,126 +36769,99 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29285,6 +36724,8 @@
  }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +for ac_lib in '' dir; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -29293,12 +36734,44 @@
 +    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 +  fi
 +  rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
    ac_status=$?
-@@ -34007,34 +34747,43 @@
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_search_opendir="-l$ac_lib"
 -break
@@ -29316,13 +36789,13 @@
 +      conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then
 +  break
- fi
++fi
 +done
 +if test "${ac_cv_search_opendir+set}" = set; then
 +  :
 +else
 +  ac_cv_search_opendir=no
-+fi
+ fi
 +rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
@@ -29351,7 +36824,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34042,77 +34791,29 @@
+@@ -34042,122 +36869,96 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29429,6 +36902,8 @@
  }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
 +for ac_lib in '' x; do
 +  if test -z "$ac_lib"; then
 +    ac_res="none required"
@@ -29437,12 +36912,44 @@
 +    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 +  fi
 +  rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
    ac_status=$?
-@@ -34134,30 +34835,40 @@
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_search_opendir="-l$ac_lib"
 -break
@@ -29460,13 +36967,13 @@
 +      conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then
 +  break
- fi
++fi
 +done
 +if test "${ac_cv_search_opendir+set}" = set; then
 +  :
 +else
 +  ac_cv_search_opendir=no
-+fi
+ fi
 +rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
@@ -29491,7 +36998,52 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34207,8 +34918,9 @@
+@@ -34181,24 +36982,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34207,8 +37020,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29502,7 +37054,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
-@@ -34265,6 +34977,7 @@
+@@ -34265,6 +37079,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -29510,7 +37062,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -34284,8 +34997,8 @@
+@@ -34284,18 +37099,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -29521,7 +37073,30 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -34308,12 +35021,14 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34308,12 +37132,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -29539,7 +37114,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -34366,18 +35081,19 @@
+@@ -34366,18 +37192,19 @@
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29567,7 +37142,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34414,15 +35130,16 @@
+@@ -34388,24 +37215,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34414,15 +37253,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29589,7 +37209,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34456,9 +35173,10 @@
+@@ -34431,8 +37271,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -34456,9 +37301,10 @@
  
    ac_header_preproc=no
  fi
@@ -29602,7 +37238,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34482,25 +35200,19 @@
+@@ -34482,25 +37328,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29635,7 +37271,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34513,17 +35225,17 @@
+@@ -34513,17 +37353,17 @@
  done
  
  if test "${ac_cv_header_pty_h+set}" = set; then
@@ -29659,7 +37295,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34560,15 +35272,16 @@
+@@ -34534,24 +37374,36 @@
+ #include <pty.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34560,15 +37412,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29681,7 +37362,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34602,9 +35315,10 @@
+@@ -34577,8 +37430,13 @@
+ /* end confdefs.h.  */
+ #include <pty.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -34602,9 +37460,10 @@
  
    ac_header_preproc=no
  fi
@@ -29694,7 +37391,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34628,31 +35342,24 @@
+@@ -34628,31 +37487,24 @@
  echo "$as_me: WARNING: pty.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: pty.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: pty.h: in the future, the compiler will take precedence" >&2;}
@@ -29733,7 +37430,7 @@
  if test "${ac_cv_func_ptsname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34679,30 +35386,24 @@
+@@ -34679,53 +37531,59 @@
  
  #undef ptsname
  
@@ -29769,7 +37466,50 @@
    ;
    return 0;
  }
-@@ -34734,18 +35435,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34734,18 +37592,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29794,7 +37534,7 @@
  if test "${ac_cv_lib_Alib_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34762,7 +35464,7 @@
+@@ -34762,30 +37621,42 @@
  int
  main ()
  {
@@ -29803,7 +37543,50 @@
    ;
    return 0;
  }
-@@ -34794,21 +35496,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34794,21 +37665,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29831,7 +37614,7 @@
  if test "${ac_cv_func_clnttcp_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34835,30 +35538,24 @@
+@@ -34835,53 +37707,59 @@
  
  #undef clnttcp_create
  
@@ -29867,7 +37650,50 @@
    ;
    return 0;
  }
-@@ -34890,19 +35587,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34890,19 +37768,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29893,7 +37719,7 @@
  if test "${ac_cv_lib_nsl_clnttcp_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34915,17 +35613,17 @@
+@@ -34915,40 +37794,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29915,7 +37741,50 @@
    ;
    return 0;
  }
-@@ -34957,14 +35655,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -34957,14 +37848,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29934,7 +37803,7 @@
  if test $ac_cv_lib_nsl_clnttcp_create = yes; then
    LIBRPC="-lnsl"
  fi
-@@ -34973,8 +35672,8 @@
+@@ -34973,8 +37865,8 @@
  
  
  
@@ -29945,7 +37814,7 @@
  if test "${ac_cv_lib_ossaudio_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34991,7 +35690,7 @@
+@@ -34991,30 +37883,42 @@
  int
  main ()
  {
@@ -29954,7 +37823,50 @@
    ;
    return 0;
  }
-@@ -35023,22 +35722,23 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35023,22 +37927,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29983,7 +37895,7 @@
  if test "${ac_cv_lib_cfg_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35055,7 +35755,7 @@
+@@ -35055,30 +37960,42 @@
  int
  main ()
  {
@@ -29992,7 +37904,50 @@
    ;
    return 0;
  }
-@@ -35087,20 +35787,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35087,20 +38004,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30019,7 +37974,7 @@
  if test "${ac_cv_lib_odm_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35117,7 +35818,7 @@
+@@ -35117,30 +38035,42 @@
  int
  main ()
  {
@@ -30028,7 +37983,50 @@
    ;
    return 0;
  }
-@@ -35149,14 +35850,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35149,14 +38079,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30047,7 +38045,7 @@
  if test $ac_cv_lib_odm_main = yes; then
    LIBODM="-lodm"
  fi
-@@ -35164,8 +35866,8 @@
+@@ -35164,8 +38095,8 @@
  
  
  kde_have_setupterm=yes
@@ -30058,7 +38056,7 @@
  if test "${ac_cv_lib_curses_setupterm+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35178,17 +35880,17 @@
+@@ -35178,40 +38109,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30080,7 +38078,50 @@
    ;
    return 0;
  }
-@@ -35220,19 +35922,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35220,19 +38163,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30106,7 +38147,7 @@
  if test "${ac_cv_lib_ncurses_setupterm+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35245,17 +35948,17 @@
+@@ -35245,40 +38189,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30128,7 +38169,50 @@
    ;
    return 0;
  }
-@@ -35287,19 +35990,20 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35287,19 +38243,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30154,7 +38238,7 @@
  if test "${ac_cv_lib_mytinfo_setupterm+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35312,17 +36016,17 @@
+@@ -35312,40 +38269,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30176,7 +38260,50 @@
    ;
    return 0;
  }
-@@ -35354,14 +36058,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35354,14 +38323,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30195,62 +38322,90 @@
  if test $ac_cv_lib_mytinfo_setupterm = yes; then
    LIBCURSES=-lmytinfo
  else
-@@ -35384,8 +36089,8 @@
+@@ -35383,88 +38353,8 @@
+ 
  fi
  
- kde_have_utempter=yes
+-kde_have_utempter=yes
 -echo "$as_me:$LINENO: checking for addToUtmp in -lutempter" >&5
 -echo $ECHO_N "checking for addToUtmp in -lutempter... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for addToUtmp in -lutempter" >&5
-+echo $ECHO_N "checking for addToUtmp in -lutempter... $ECHO_C" >&6; }
- if test "${ac_cv_lib_utempter_addToUtmp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -35398,17 +36103,17 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
+-if test "${ac_cv_lib_utempter_addToUtmp+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lutempter  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
 -/* Override any gcc2 internal prototype to avoid an error.  */
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
- #ifdef __cplusplus
- extern "C"
- #endif
+-#ifdef __cplusplus
+-extern "C"
+-#endif
 -/* We use char because int might match the return type of a gcc2
 -   builtin and then its argument prototype would still apply.  */
- char addToUtmp ();
- int
- main ()
- {
+-char addToUtmp ();
+-int
+-main ()
+-{
 -addToUtmp ();
-+return addToUtmp ();
-   ;
-   return 0;
- }
-@@ -35440,14 +36145,15 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_utempter_addToUtmp=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -ac_cv_lib_utempter_addToUtmp=no
-+	ac_cv_lib_utempter_addToUtmp=no
- fi
-+
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_lib_utempter_addToUtmp" >&5
 -echo "${ECHO_T}$ac_cv_lib_utempter_addToUtmp" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_utempter_addToUtmp" >&5
-+echo "${ECHO_T}$ac_cv_lib_utempter_addToUtmp" >&6; }
- if test $ac_cv_lib_utempter_addToUtmp = yes; then
-   LIBUTEMPTER=-lutempter
- else
-@@ -35463,8 +36169,8 @@
- 
- fi
- 
+-if test $ac_cv_lib_utempter_addToUtmp = yes; then
+-  LIBUTEMPTER=-lutempter
+-else
+-  kde_have_utempter=no
+-fi
+-
+-
+-if test "$kde_have_utempter" = "yes"; then
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_UTEMPTER 1
+-_ACEOF
+-
+-fi
+-
 -echo "$as_me:$LINENO: checking for res_init" >&5
 -echo $ECHO_N "checking for res_init... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for res_init" >&5
@@ -30258,7 +38413,7 @@
  if test "${ac_cv_func_res_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35491,30 +36197,24 @@
+@@ -35491,53 +38381,59 @@
  
  #undef res_init
  
@@ -30294,7 +38449,50 @@
    ;
    return 0;
  }
-@@ -35546,18 +36246,19 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35546,18 +38442,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30319,7 +38517,7 @@
  if test "${ac_cv_lib_resolv_res_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35570,17 +36271,17 @@
+@@ -35570,40 +38467,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30341,7 +38539,50 @@
    ;
    return 0;
  }
-@@ -35612,14 +36313,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35612,14 +38521,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30360,7 +38601,7 @@
  if test $ac_cv_lib_resolv_res_init = yes; then
    LIBRESOLV="-lresolv"
  fi
-@@ -35628,7 +36330,7 @@
+@@ -35628,7 +38538,7 @@
  
  
  
@@ -30369,7 +38610,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -35637,8 +36339,8 @@
+@@ -35637,8 +38547,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -30380,7 +38621,52 @@
  if test "${ac_cv_header_time+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35688,12 +36390,13 @@
+@@ -35662,24 +38572,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35688,12 +38610,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30397,7 +38683,7 @@
  if test $ac_cv_header_time = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -35716,9 +36419,11 @@
+@@ -35716,9 +38639,11 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
@@ -30412,7 +38698,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -35728,13 +36433,27 @@
+@@ -35728,13 +38653,27 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <float.h>
@@ -30444,9 +38730,50 @@
  test_array [0] = 0
  
    ;
-@@ -35763,27 +36482,37 @@
+@@ -35742,48 +38681,70 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
 -  ac_cv_c_long_double=yes
 +  ac_cv_type_long_double_wider=yes
@@ -30490,7 +38817,7 @@
  if test "${ac_cv_type_uid_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35805,8 +36534,8 @@
+@@ -35805,8 +38766,8 @@
  rm -f conftest*
  
  fi
@@ -30501,7 +38828,7 @@
  if test $ac_cv_type_uid_t = no; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -35820,8 +36549,8 @@
+@@ -35820,8 +38781,8 @@
  
  fi
  
@@ -30512,7 +38839,7 @@
  if test "${ac_cv_type_getgroups+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35835,7 +36564,7 @@
+@@ -35835,7 +38796,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Thanks to Mike Rendell for this test.  */
@@ -30521,7 +38848,7 @@
  #define NGID 256
  #undef MAX
  #define MAX(x, y) ((x) > (y) ? (x) : (y))
-@@ -35845,7 +36574,7 @@
+@@ -35845,7 +38806,7 @@
  {
    gid_t gidset[NGID];
    int i, n;
@@ -30530,7 +38857,7 @@
  
    val.lval = -1;
    for (i = 0; i < NGID; i++)
-@@ -35853,8 +36582,9 @@
+@@ -35853,18 +38814,28 @@
    n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
  		 gidset);
    /* Exit non-zero if getgroups seems to require an array of ints.  This
@@ -30542,7 +38869,30 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -35877,8 +36607,10 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35877,8 +38848,10 @@
  ( exit $ac_status )
  ac_cv_type_getgroups=int
  fi
@@ -30554,7 +38904,7 @@
  if test $ac_cv_type_getgroups = cross; then
          cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -35899,8 +36631,8 @@
+@@ -35899,8 +38872,8 @@
  
  fi
  fi
@@ -30565,7 +38915,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define GETGROUPS_T $ac_cv_type_getgroups
-@@ -35908,8 +36640,8 @@
+@@ -35908,8 +38881,8 @@
  
  
  
@@ -30576,7 +38926,7 @@
  if test "${ac_cv_type_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35920,12 +36652,13 @@
+@@ -35920,36 +38893,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30592,7 +38942,51 @@
    return 0;
    ;
    return 0;
-@@ -35958,20 +36691,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -35958,20 +38944,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30620,7 +39014,7 @@
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
-@@ -35984,10 +36718,11 @@
+@@ -35984,10 +38971,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30633,7 +39027,52 @@
  test_array [0] = 0
  
    ;
-@@ -36025,10 +36760,11 @@
+@@ -35995,24 +38983,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36025,10 +39025,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30646,7 +39085,52 @@
  test_array [0] = 0
  
    ;
-@@ -36062,30 +36798,32 @@
+@@ -36036,24 +39037,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36062,30 +39075,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30687,7 +39171,52 @@
  test_array [0] = 0
  
    ;
-@@ -36123,10 +36861,11 @@
+@@ -36093,24 +39108,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36123,10 +39150,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30700,7 +39229,52 @@
  test_array [0] = 0
  
    ;
-@@ -36160,23 +36899,26 @@
+@@ -36134,24 +39162,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36160,23 +39200,26 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30734,7 +39308,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -36188,10 +36930,11 @@
+@@ -36188,10 +39231,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30747,7 +39321,52 @@
  test_array [0] = 0
  
    ;
-@@ -36225,26 +36968,20 @@
+@@ -36199,24 +39243,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36225,26 +39281,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30779,7 +39398,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36252,8 +36989,9 @@
+@@ -36252,8 +39302,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30791,7 +39410,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -36262,22 +37000,22 @@
+@@ -36262,35 +39313,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -30823,7 +39442,33 @@
  
    ;
    return 0;
-@@ -36301,29 +37039,28 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36301,29 +39361,28 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -30861,7 +39506,7 @@
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36334,12 +37071,13 @@
+@@ -36334,36 +39393,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30877,7 +39522,51 @@
    return 0;
    ;
    return 0;
-@@ -36372,20 +37110,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36372,20 +39444,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30905,7 +39594,7 @@
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
-@@ -36398,10 +37137,11 @@
+@@ -36398,10 +39471,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30918,7 +39607,52 @@
  test_array [0] = 0
  
    ;
-@@ -36439,10 +37179,11 @@
+@@ -36409,24 +39483,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36439,10 +39525,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30931,7 +39665,52 @@
  test_array [0] = 0
  
    ;
-@@ -36476,30 +37217,32 @@
+@@ -36450,24 +39537,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36476,30 +39575,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30972,7 +39751,52 @@
  test_array [0] = 0
  
    ;
-@@ -36537,10 +37280,11 @@
+@@ -36507,24 +39608,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36537,10 +39650,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30985,7 +39809,52 @@
  test_array [0] = 0
  
    ;
-@@ -36574,23 +37318,26 @@
+@@ -36548,24 +39662,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36574,23 +39700,26 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31019,7 +39888,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -36602,10 +37349,11 @@
+@@ -36602,10 +39731,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31032,7 +39901,52 @@
  test_array [0] = 0
  
    ;
-@@ -36639,26 +37387,20 @@
+@@ -36613,24 +39743,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36639,26 +39781,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31064,7 +39978,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36666,8 +37408,9 @@
+@@ -36666,8 +39802,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31076,7 +39990,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -36676,22 +37419,22 @@
+@@ -36676,35 +39813,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31108,7 +40022,33 @@
  
    ;
    return 0;
-@@ -36715,29 +37458,28 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36715,29 +39861,28 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -31146,7 +40086,7 @@
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36748,12 +37490,13 @@
+@@ -36748,36 +39893,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31162,7 +40102,51 @@
    return 0;
    ;
    return 0;
-@@ -36786,20 +37529,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36786,20 +39944,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31190,7 +40174,7 @@
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
-@@ -36812,10 +37556,11 @@
+@@ -36812,10 +39971,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31203,7 +40187,52 @@
  test_array [0] = 0
  
    ;
-@@ -36853,10 +37598,11 @@
+@@ -36823,24 +39983,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36853,10 +40025,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31216,7 +40245,52 @@
  test_array [0] = 0
  
    ;
-@@ -36890,30 +37636,32 @@
+@@ -36864,24 +40037,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36890,30 +40075,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31257,7 +40331,52 @@
  test_array [0] = 0
  
    ;
-@@ -36951,10 +37699,11 @@
+@@ -36921,24 +40108,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36951,10 +40150,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31270,7 +40389,52 @@
  test_array [0] = 0
  
    ;
-@@ -36988,23 +37737,26 @@
+@@ -36962,24 +40162,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -36988,23 +40200,26 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31304,7 +40468,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -37016,10 +37768,11 @@
+@@ -37016,10 +40231,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31317,7 +40481,52 @@
  test_array [0] = 0
  
    ;
-@@ -37053,26 +37806,20 @@
+@@ -37027,24 +40243,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37053,26 +40281,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31349,7 +40558,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37080,8 +37827,9 @@
+@@ -37080,8 +40302,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31361,7 +40570,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -37090,22 +37838,22 @@
+@@ -37090,35 +40313,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31393,7 +40602,33 @@
  
    ;
    return 0;
-@@ -37129,29 +37877,28 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37129,29 +40361,28 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -31431,7 +40666,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37162,12 +37909,13 @@
+@@ -37162,36 +40393,49 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31447,7 +40682,51 @@
    return 0;
    ;
    return 0;
-@@ -37200,20 +37948,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37200,20 +40444,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31475,7 +40754,7 @@
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
-@@ -37226,10 +37975,11 @@
+@@ -37226,10 +40471,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31488,7 +40767,52 @@
  test_array [0] = 0
  
    ;
-@@ -37267,10 +38017,11 @@
+@@ -37237,24 +40483,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37267,10 +40525,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31501,7 +40825,52 @@
  test_array [0] = 0
  
    ;
-@@ -37304,30 +38055,32 @@
+@@ -37278,24 +40537,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37304,30 +40575,32 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31542,7 +40911,52 @@
  test_array [0] = 0
  
    ;
-@@ -37365,10 +38118,11 @@
+@@ -37335,24 +40608,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37365,10 +40650,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31555,7 +40969,52 @@
  test_array [0] = 0
  
    ;
-@@ -37402,23 +38156,26 @@
+@@ -37376,24 +40662,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37402,23 +40700,26 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31589,7 +41048,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
-@@ -37430,10 +38187,11 @@
+@@ -37430,10 +40731,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31602,7 +41061,52 @@
  test_array [0] = 0
  
    ;
-@@ -37467,26 +38225,20 @@
+@@ -37441,24 +40743,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37467,26 +40781,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31634,7 +41138,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37494,8 +38246,9 @@
+@@ -37494,8 +40802,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31646,7 +41150,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -37504,22 +38257,22 @@
+@@ -37504,35 +40813,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31678,7 +41182,33 @@
  
    ;
    return 0;
-@@ -37543,29 +38296,28 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37543,29 +40861,28 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
@@ -31686,12 +41216,11 @@
 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long), 77
--See \`config.log' for more details." >&2;}
++echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+echo "$as_me: error: cannot compute sizeof (long)
-+See \`config.log' for more details." >&2;}
 +   { (exit 77); exit 77; }; }
  fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
@@ -31717,7 +41246,97 @@
  if test "${ac_cv_c_bigendian+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37660,14 +38412,15 @@
+@@ -37591,24 +40908,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37634,24 +40963,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37660,14 +41001,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31735,7 +41354,7 @@
  if test "$cross_compiling" = yes; then
    # try to guess the endianness by grepping values into an object file
    ac_cv_c_bigendian=unknown
-@@ -37677,11 +38430,11 @@
+@@ -37677,11 +41019,11 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -31751,7 +41370,52 @@
  void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
-@@ -37728,7 +38481,9 @@
+@@ -37692,24 +41034,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37728,7 +41082,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31761,7 +41425,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37737,17 +38492,22 @@
+@@ -37737,27 +41093,41 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -31787,7 +41451,30 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -37770,13 +38530,16 @@
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37770,13 +41140,16 @@
  ( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
@@ -31807,7 +41494,7 @@
  case $ac_cv_c_bigendian in
    yes)
  
-@@ -37818,9 +38581,9 @@
+@@ -37818,9 +41191,9 @@
  for ac_func in socket powl sqrtl strdup getdtablesize setpgid nice seteuid vsyslog initgroups setgroups getgroups grantpt pw_encrypt setpriority getpt unlockpt ptsname waitpid getpassphrase
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -31820,7 +41507,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37846,30 +38609,24 @@
+@@ -37846,53 +41219,59 @@
  
  #undef $ac_func
  
@@ -31856,7 +41543,50 @@
    ;
    return 0;
  }
-@@ -37901,13 +38658,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37901,13 +41280,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31875,7 +41605,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -37918,15 +38677,14 @@
+@@ -37918,15 +41299,14 @@
  
  
  
@@ -31894,7 +41624,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -37938,9 +38696,6 @@
+@@ -37938,9 +41318,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -31904,7 +41634,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37992,8 +38747,9 @@
+@@ -37966,24 +41343,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -37992,8 +41381,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31915,7 +41690,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -38007,11 +38763,11 @@
+@@ -38007,11 +41397,11 @@
  fi
  
  
@@ -31931,7 +41706,7 @@
  if test "${kde_cv_proto_mkstemps+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -38032,8 +38788,7 @@
+@@ -38032,8 +41422,7 @@
  if test "x$kde_cv_proto_mkstemps" = xunknown; then
  
  
@@ -31941,7 +41716,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38098,9 +38853,10 @@
+@@ -38071,24 +41460,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -38098,9 +41499,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31953,7 +41773,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -38114,8 +38870,8 @@
+@@ -38114,8 +41516,8 @@
  
  fi
  
@@ -31964,7 +41784,7 @@
  
  if test "x$kde_cv_func_mkstemps" = xyes; then
  
-@@ -38139,15 +38895,14 @@
+@@ -38139,15 +41541,14 @@
  
  
  
@@ -31983,7 +41803,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38159,9 +38914,6 @@
+@@ -38159,9 +41560,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -31993,7 +41813,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38210,8 +38962,9 @@
+@@ -38184,24 +41582,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -38210,8 +41620,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32004,7 +41869,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -38225,11 +38978,11 @@
+@@ -38225,11 +41636,11 @@
  fi
  
  
@@ -32020,7 +41885,7 @@
  if test "${kde_cv_proto_setenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -38250,8 +39003,7 @@
+@@ -38250,8 +41661,7 @@
  if test "x$kde_cv_proto_setenv" = xunknown; then
  
  
@@ -32030,7 +41895,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38313,9 +39065,10 @@
+@@ -38286,24 +41696,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -38313,9 +41735,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32042,7 +41952,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -38329,8 +39082,8 @@
+@@ -38329,8 +41752,8 @@
  
  fi
  
@@ -32053,7 +41963,7 @@
  
  if test "x$kde_cv_func_setenv" = xyes; then
  
-@@ -38354,15 +39107,14 @@
+@@ -38354,15 +41777,14 @@
  
  
  
@@ -32072,7 +41982,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38374,9 +39126,6 @@
+@@ -38374,9 +41796,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32082,7 +41992,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38425,8 +39174,9 @@
+@@ -38399,24 +41818,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -38425,8 +41856,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32093,7 +42048,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -38440,11 +39190,11 @@
+@@ -38440,11 +41872,11 @@
  fi
  
  
@@ -32109,7 +42064,7 @@
  if test "${kde_cv_proto_unsetenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -38465,8 +39215,7 @@
+@@ -38465,8 +41897,7 @@
  if test "x$kde_cv_proto_unsetenv" = xunknown; then
  
  
@@ -32119,7 +42074,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38528,9 +39277,10 @@
+@@ -38501,24 +41932,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -38528,9 +41971,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32131,7 +42131,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -38544,8 +39294,8 @@
+@@ -38544,8 +41988,8 @@
  
  fi
  
@@ -32142,7 +42142,7 @@
  
  if test "x$kde_cv_func_unsetenv" = xyes; then
  
-@@ -38569,15 +39319,14 @@
+@@ -38569,15 +42013,14 @@
  
  
  
@@ -32161,7 +42161,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38589,9 +39338,6 @@
+@@ -38589,9 +42032,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32171,7 +42171,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38645,8 +39391,9 @@
+@@ -38619,24 +42059,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -38645,8 +42097,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32182,7 +42227,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -38660,11 +39407,11 @@
+@@ -38660,11 +42113,11 @@
  fi
  
  
@@ -32198,7 +42243,7 @@
  if test "${kde_cv_proto_getdomainname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -38685,8 +39432,7 @@
+@@ -38685,8 +42138,7 @@
  if test "x$kde_cv_proto_getdomainname" = xunknown; then
  
  
@@ -32208,7 +42253,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38754,9 +39500,10 @@
+@@ -38727,24 +42179,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -38754,9 +42218,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32220,7 +42310,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -38770,8 +39517,8 @@
+@@ -38770,8 +42235,8 @@
  
  fi
  
@@ -32231,7 +42321,7 @@
  
  if test "x$kde_cv_func_getdomainname" = xyes; then
  
-@@ -38795,15 +39542,14 @@
+@@ -38795,15 +42260,14 @@
  
  
  
@@ -32250,7 +42340,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38815,9 +39561,6 @@
+@@ -38815,9 +42279,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32260,7 +42350,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38870,8 +39613,9 @@
+@@ -38844,24 +42305,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -38870,8 +42343,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32271,7 +42406,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -38885,11 +39629,11 @@
+@@ -38885,11 +42359,11 @@
  fi
  
  
@@ -32287,7 +42422,7 @@
  if test "${kde_cv_proto_gethostname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -38910,8 +39654,7 @@
+@@ -38910,8 +42384,7 @@
  if test "x$kde_cv_proto_gethostname" = xunknown; then
  
  
@@ -32297,7 +42432,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -38977,9 +39720,10 @@
+@@ -38950,24 +42423,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -38977,9 +42462,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32309,7 +42489,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -38993,8 +39737,8 @@
+@@ -38993,8 +42479,8 @@
  
  fi
  
@@ -32320,7 +42500,7 @@
  
  if test "x$kde_cv_func_gethostname" = xyes; then
  
-@@ -39018,15 +39762,14 @@
+@@ -39018,15 +42504,14 @@
  
  
  
@@ -32339,7 +42519,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39038,9 +39781,6 @@
+@@ -39038,9 +42523,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32349,7 +42529,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39091,8 +39831,9 @@
+@@ -39065,24 +42547,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -39091,8 +42585,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32360,7 +42585,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -39106,11 +39847,11 @@
+@@ -39106,11 +42601,11 @@
  fi
  
  
@@ -32376,7 +42601,7 @@
  if test "${kde_cv_proto_usleep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -39131,8 +39872,7 @@
+@@ -39131,8 +42626,7 @@
  if test "x$kde_cv_proto_usleep" = xunknown; then
  
  
@@ -32386,7 +42611,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39196,9 +39936,10 @@
+@@ -39169,24 +42663,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -39196,9 +42702,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32398,7 +42668,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -39212,8 +39953,8 @@
+@@ -39212,8 +42719,8 @@
  
  fi
  
@@ -32409,7 +42679,7 @@
  
  if test "x$kde_cv_func_usleep" = xyes; then
  
-@@ -39237,15 +39978,14 @@
+@@ -39237,15 +42744,14 @@
  
  
  
@@ -32428,7 +42698,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39257,9 +39997,6 @@
+@@ -39257,9 +42763,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32438,7 +42708,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39310,8 +40047,9 @@
+@@ -39284,24 +42787,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -39310,8 +42825,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32449,7 +42764,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -39325,11 +40063,11 @@
+@@ -39325,11 +42841,11 @@
  fi
  
  
@@ -32465,7 +42780,7 @@
  if test "${kde_cv_proto_random+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -39350,8 +40088,7 @@
+@@ -39350,8 +42866,7 @@
  if test "x$kde_cv_proto_random" = xunknown; then
  
  
@@ -32475,7 +42790,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39415,9 +40152,10 @@
+@@ -39388,24 +42903,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -39415,9 +42942,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32487,7 +42847,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -39431,8 +40169,8 @@
+@@ -39431,8 +42959,8 @@
  
  fi
  
@@ -32498,7 +42858,7 @@
  
  if test "x$kde_cv_func_random" = xyes; then
  
-@@ -39455,15 +40193,14 @@
+@@ -39455,15 +42983,14 @@
  
  
  
@@ -32517,7 +42877,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39475,9 +40212,6 @@
+@@ -39475,9 +43002,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -32527,7 +42887,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39528,8 +40262,9 @@
+@@ -39502,24 +43026,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -39528,8 +43064,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32538,7 +42943,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
-@@ -39543,11 +40278,11 @@
+@@ -39543,11 +43080,11 @@
  fi
  
  
@@ -32554,7 +42959,7 @@
  if test "${kde_cv_proto_srandom+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -39568,8 +40303,7 @@
+@@ -39568,8 +43105,7 @@
  if test "x$kde_cv_proto_srandom" = xunknown; then
  
  
@@ -32564,7 +42969,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -39633,9 +40367,10 @@
+@@ -39606,24 +43142,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -39633,9 +43181,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32576,7 +43026,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
-@@ -39649,8 +40384,8 @@
+@@ -39649,8 +43198,8 @@
  
  fi
  
@@ -32587,7 +43037,7 @@
  
  if test "x$kde_cv_func_srandom" = xyes; then
  
-@@ -39674,8 +40409,8 @@
+@@ -39674,8 +43223,8 @@
  
  
  
@@ -32598,7 +43048,52 @@
  if test "${ac_cv_have_s_issock+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -39727,15 +40462,16 @@
+@@ -39701,24 +43250,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -39727,15 +43288,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32618,7 +43113,7 @@
  if test "$ac_cv_have_s_issock" = "yes"; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -39749,8 +40485,8 @@
+@@ -39749,8 +43311,8 @@
  
  
  
@@ -32629,7 +43124,7 @@
  if test "${ac_cv_maxpathlen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -39786,16 +40522,16 @@
+@@ -39786,16 +43348,16 @@
  
  fi
  
@@ -32650,7 +43145,7 @@
  
  case "$host_os" in
  linux*) utmp_support=yes;
-@@ -39807,8 +40543,8 @@
+@@ -39807,8 +43369,8 @@
  *) utmp_support=no;
  esac
  
@@ -32661,7 +43156,7 @@
  
  if test "$utmp_support" = yes; then
  
-@@ -39819,8 +40555,8 @@
+@@ -39819,8 +43381,8 @@
  fi
  
  
@@ -32672,7 +43167,7 @@
  
      if test "${kde_cv_utmp_file+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -39851,18 +40587,18 @@
+@@ -39851,18 +43413,18 @@
  _ACEOF
  
  
@@ -32697,7 +43192,7 @@
  if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -39875,17 +40611,17 @@
+@@ -39875,40 +43437,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -32719,7 +43214,50 @@
    ;
    return 0;
  }
-@@ -39917,14 +40653,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -39917,14 +43491,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32738,7 +43276,7 @@
  if test $ac_cv_lib_kstat_kstat_open = yes; then
    LIBKSTAT=-lkstat
  else
-@@ -39941,17 +40678,17 @@
+@@ -39941,17 +43516,17 @@
  fi
  
  if test "${ac_cv_header_libdevinfo_h+set}" = set; then
@@ -32762,7 +43300,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39988,15 +40725,16 @@
+@@ -39962,24 +43537,36 @@
+ #include <libdevinfo.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -39988,15 +43575,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32784,7 +43367,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40030,9 +40768,10 @@
+@@ -40005,8 +43593,13 @@
+ /* end confdefs.h.  */
+ #include <libdevinfo.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -40030,9 +43623,10 @@
  
    ac_header_preproc=no
  fi
@@ -32797,7 +43396,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -40056,25 +40795,18 @@
+@@ -40056,25 +43650,18 @@
  echo "$as_me: WARNING: libdevinfo.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: libdevinfo.h: in the future, the compiler will take precedence" >&2;}
@@ -32828,7 +43427,7 @@
  
  fi
  if test $ac_cv_header_libdevinfo_h = yes; then
-@@ -40086,8 +40818,8 @@
+@@ -40086,8 +43673,8 @@
  
  if test "$kde_have_libdevinfo_h" = "yes"; then
     kde_have_libdevinfo_lib=yes
@@ -32839,7 +43438,7 @@
  if test "${ac_cv_lib_devinfo_di_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -40100,17 +40832,17 @@
+@@ -40100,40 +43687,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -32861,7 +43460,50 @@
    ;
    return 0;
  }
-@@ -40142,14 +40874,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -40142,14 +43741,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32880,7 +43522,7 @@
  if test $ac_cv_lib_devinfo_di_init = yes; then
    LIBDEVINFO=-ldevinfo
  else
-@@ -40169,18 +40902,18 @@
+@@ -40169,18 +43769,18 @@
  
  
  
@@ -32905,7 +43547,7 @@
  
  if test "x$ac_java_dir" = "xno"; then
     kde_java_bindir=no
-@@ -40616,8 +41349,7 @@
+@@ -40616,8 +44216,7 @@
  
    if test -n "$jni_includes"; then
  
@@ -32915,7 +43557,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -40677,8 +41409,9 @@
+@@ -40651,24 +44250,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -40677,8 +44288,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32926,7 +43613,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
      if test $kde_jni_works = no; then
-@@ -40721,8 +41454,8 @@
+@@ -40721,8 +44333,8 @@
      else
        JVMLIBS="-L$kde_java_libgcjdir -lgcj"
      fi
@@ -32937,7 +43624,7 @@
  
    else
  
-@@ -40730,8 +41463,8 @@
+@@ -40730,8 +44342,8 @@
  #define PATH_JAVA "$kde_java_bindir/java"
  _ACEOF
  
@@ -32948,7 +43635,7 @@
    fi
  elif test -d "/Library/Java/Home"; then
    kde_java_bindir="/Library/Java/Home/bin"
-@@ -40747,11 +41480,11 @@
+@@ -40747,11 +44359,11 @@
  #define PATH_JAVA "$kde_java_bindir/java"
  _ACEOF
  
@@ -32964,7 +43651,7 @@
  fi
  
  
-@@ -40770,8 +41503,8 @@
+@@ -40770,8 +44382,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -32975,7 +43662,7 @@
  if test "${ac_cv_path_MD5SUM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -40786,35 +41519,36 @@
+@@ -40786,35 +44398,36 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -33020,7 +43707,7 @@
  if test "${ac_cv_path_MD5SUM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -40829,32 +41563,33 @@
+@@ -40829,32 +44442,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -33062,7 +43749,7 @@
  if test "${ac_cv_path_MD5SUM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -40869,27 +41604,28 @@
+@@ -40869,27 +44483,28 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -33097,7 +43784,7 @@
    fi
    if test -z "$MD5SUM" ; then
      { echo "$as_me:$LINENO: WARNING: No md5sum, gmd5sum, or md5 was found. The fish IOSlave cannot be compiled." >&5
-@@ -40911,8 +41647,7 @@
+@@ -40911,8 +44526,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -33107,7 +43794,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -40922,17 +41657,17 @@
+@@ -40922,17 +44536,17 @@
  
  
     if test "${ac_cv_header_X11_extensions_XTest_h+set}" = set; then
@@ -33131,7 +43818,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40969,15 +41704,16 @@
+@@ -40943,24 +44557,36 @@
+ #include <X11/extensions/XTest.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -40969,15 +44595,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33153,7 +43885,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -41011,9 +41747,10 @@
+@@ -40986,8 +44613,13 @@
+ /* end confdefs.h.  */
+ #include <X11/extensions/XTest.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -41011,9 +44643,10 @@
  
    ac_header_preproc=no
  fi
@@ -33166,7 +43914,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -41037,30 +41774,23 @@
+@@ -41037,30 +44670,23 @@
  echo "$as_me: WARNING: X11/extensions/XTest.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: X11/extensions/XTest.h: in the future, the compiler will take precedence" >&2;}
@@ -33204,7 +43952,7 @@
  if test "${ac_cv_lib_Xtst_XTestFakeKeyEvent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -41073,17 +41803,17 @@
+@@ -41073,40 +44699,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33226,7 +43974,50 @@
    ;
    return 0;
  }
-@@ -41115,14 +41845,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -41115,14 +44753,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33245,7 +44036,7 @@
  if test $ac_cv_lib_Xtst_XTestFakeKeyEvent = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -41150,8 +41881,7 @@
+@@ -41150,8 +44789,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -33255,7 +44046,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -41160,8 +41890,8 @@
+@@ -41160,8 +44798,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -33266,7 +44057,52 @@
  if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -41202,15 +41932,16 @@
+@@ -41176,24 +44814,36 @@
+ #include <X11/XKBlib.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -41202,15 +44852,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33288,7 +44124,7 @@
  if test "${ac_cv_lib_X11_XkbLockModifiers+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -41223,17 +41954,17 @@
+@@ -41223,40 +44874,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33310,7 +44146,50 @@
    ;
    return 0;
  }
-@@ -41265,14 +41996,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -41265,14 +44928,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33329,7 +44208,7 @@
  if test $ac_cv_lib_X11_XkbLockModifiers = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -41281,8 +42013,8 @@
+@@ -41281,8 +44945,8 @@
  
  fi
  
@@ -33340,7 +44219,7 @@
  if test "${ac_cv_lib_X11_XkbSetPerClientControls+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -41295,17 +42027,17 @@
+@@ -41295,40 +44959,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33362,7 +44241,50 @@
    ;
    return 0;
  }
-@@ -41337,14 +42069,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -41337,14 +45013,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33381,7 +44303,7 @@
  if test $ac_cv_lib_X11_XkbSetPerClientControls = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -41370,10 +42103,9 @@
+@@ -41370,10 +45047,9 @@
  
  
  
@@ -33393,7 +44315,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -41386,9 +42118,9 @@
+@@ -41386,9 +45062,9 @@
  for ac_header in X11/Xcursor/Xcursor.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -33406,7 +44328,52 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -41428,12 +42160,14 @@
+@@ -41402,24 +45078,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -41428,12 +45116,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33424,7 +44391,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -41447,8 +42181,8 @@
+@@ -41447,8 +45137,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -33435,7 +44402,7 @@
  if test "${ac_cv_lib_Xcursor_XcursorSupportsARGB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -41461,17 +42195,17 @@
+@@ -41461,40 +45151,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33457,7 +44424,50 @@
    ;
    return 0;
  }
-@@ -41503,14 +42237,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -41503,14 +45205,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33476,7 +44486,7 @@
  if test $ac_cv_lib_Xcursor_XcursorSupportsARGB = yes; then
    LIB_XCURSOR=-lXcursor
  
-@@ -41556,8 +42291,7 @@
+@@ -41556,8 +45259,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -33486,7 +44496,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -41567,17 +42301,17 @@
+@@ -41567,17 +45269,17 @@
  
  
     if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then
@@ -33510,7 +44520,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -41614,15 +42348,16 @@
+@@ -41588,24 +45290,36 @@
+ #include <X11/extensions/Xrender.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -41614,15 +45328,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33532,7 +44587,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -41656,9 +42391,10 @@
+@@ -41631,8 +45346,13 @@
+ /* end confdefs.h.  */
+ #include <X11/extensions/Xrender.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -41656,9 +45376,10 @@
  
    ac_header_preproc=no
  fi
@@ -33545,7 +44616,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -41682,25 +42418,18 @@
+@@ -41682,25 +45403,18 @@
  echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;}
@@ -33576,7 +44647,7 @@
  
  fi
  if test $ac_cv_header_X11_extensions_Xrender_h = yes; then
-@@ -41728,8 +42457,8 @@
+@@ -41728,8 +45442,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -33587,7 +44658,7 @@
  if test "${ac_cv_lib_Xrender_XRenderComposite+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -41742,17 +42471,17 @@
+@@ -41742,40 +45456,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33609,7 +44680,50 @@
    ;
    return 0;
  }
-@@ -41784,14 +42513,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -41784,14 +45510,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33628,7 +44742,7 @@
  if test $ac_cv_lib_Xrender_XRenderComposite = yes; then
    LIB_XRENDER=-lXrender
  
-@@ -41816,8 +42546,8 @@
+@@ -41816,8 +45543,8 @@
  CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
  
  
@@ -33639,16 +44753,16 @@
  kde_qtdir=
  if test "${with_qt_dir+set}" = set; then
    kde_qtdir="$with_qt_dir"
-@@ -41829,7 +42559,7 @@
+@@ -41829,7 +45556,7 @@
  do
    for j in qsql.html;
    do
 -    echo "configure: 41832: $i/$j" >&5
-+    echo "configure: 42562: $i/$j" >&5
++    echo "configure: 45559: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -41838,20 +42568,20 @@
+@@ -41838,20 +45565,20 @@
    done
  done
  
@@ -33674,7 +44788,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -41894,12 +42624,12 @@
+@@ -41894,12 +45621,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33691,7 +44805,7 @@
        DOT=$kde_cv_path
  
     fi
-@@ -41911,14 +42641,14 @@
+@@ -41911,14 +45638,14 @@
  fi
  
  
@@ -33709,7 +44823,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -41961,12 +42691,12 @@
+@@ -41961,12 +45688,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33726,7 +44840,7 @@
        DOXYGEN=$kde_cv_path
  
     fi
-@@ -42032,14 +42762,14 @@
+@@ -42032,14 +45759,14 @@
  
  
  
@@ -33744,7 +44858,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -42082,15 +42812,15 @@
+@@ -42082,15 +45809,15 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -33764,7 +44878,7 @@
        LIBART_CONFIG=$kde_cv_path
  
     fi
-@@ -42129,11 +42859,11 @@
+@@ -42129,11 +45856,11 @@
  
  
  
@@ -33779,7 +44893,7 @@
  
  
  if test -z "$RUN_KAPPFINDER"; then
-@@ -42146,8 +42876,7 @@
+@@ -42146,8 +45873,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -33789,7 +44903,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -42156,8 +42885,8 @@
+@@ -42156,8 +45882,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -33800,7 +44914,52 @@
  if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -42200,12 +42929,13 @@
+@@ -42174,24 +45900,36 @@
+ #include <X11/extensions/XKBstr.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -42200,12 +45938,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33817,7 +44976,7 @@
  if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
    ACCESS_SUBDIR=access
  fi
-@@ -42236,8 +42966,7 @@
+@@ -42236,8 +45975,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -33827,7 +44986,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -42247,17 +42976,17 @@
+@@ -42247,17 +45985,17 @@
  
  
     if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
@@ -33851,7 +45010,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -42294,15 +43023,16 @@
+@@ -42268,24 +46006,36 @@
+ #include <X11/extensions/XKBstr.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -42294,15 +46044,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33873,7 +45077,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -42336,9 +43066,10 @@
+@@ -42311,8 +46062,13 @@
+ /* end confdefs.h.  */
+ #include <X11/extensions/XKBstr.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -42336,9 +46092,10 @@
  
    ac_header_preproc=no
  fi
@@ -33886,7 +45106,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -42362,25 +43093,18 @@
+@@ -42362,25 +46119,18 @@
  echo "$as_me: WARNING: X11/extensions/XKBstr.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: X11/extensions/XKBstr.h: in the future, the compiler will take precedence" >&2;}
@@ -33917,7 +45137,7 @@
  
  fi
  if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
-@@ -42415,26 +43139,26 @@
+@@ -42415,26 +46165,26 @@
  ssl_libraries=""
  ssl_includes=""
  
@@ -33954,16 +45174,61 @@
  
  if test "${ac_cv_have_ssl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -42449,7 +43173,7 @@
+@@ -42449,7 +46199,7 @@
  do
    for j in openssl/ssl.h;
    do
 -    echo "configure: 42452: $i/$j" >&5
-+    echo "configure: 43176: $i/$j" >&5
++    echo "configure: 46202: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -42523,9 +43247,10 @@
+@@ -42496,24 +46246,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -42523,9 +46285,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33975,7 +45240,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -42544,26 +43269,26 @@
+@@ -42544,26 +46307,26 @@
  
    eval "$ac_cv_have_ssl"
  
@@ -34015,7 +45280,7 @@
      if test "${ac_cv_ssl_version+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -42636,8 +43361,8 @@
+@@ -42636,8 +46399,8 @@
  
  
    eval "$ac_cv_ssl_version"
@@ -34026,7 +45291,7 @@
  fi
  
  if test "$have_ssl" != yes; then
-@@ -42696,25 +43421,25 @@
+@@ -42696,25 +46459,25 @@
   DPMS_LIB=
  
  
@@ -34060,7 +45325,97 @@
        ac_cv_have_dpms="no"
      else
        ac_save_ldflags="$LDFLAGS"
-@@ -42824,12 +43549,14 @@
+@@ -42746,24 +46509,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -42796,24 +46571,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -42824,12 +46611,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34076,7 +45431,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
        LDFLAGS="$ac_save_ldflags"
-@@ -42840,8 +43567,8 @@
+@@ -42840,8 +46629,8 @@
  fi
  
    if test "$ac_cv_have_dpms" = no; then
@@ -34087,7 +45442,7 @@
      DPMS_LDFLAGS=""
      DPMSINC=""
  
-@@ -42864,8 +43591,8 @@
+@@ -42864,8 +46653,8 @@
      else
         DPMSINC="-I$DPMS_INCLUDE"
      fi
@@ -34098,7 +45453,7 @@
  
    fi
   fi
-@@ -42874,8 +43601,8 @@
+@@ -42874,8 +46663,8 @@
   test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
  
  
@@ -34109,7 +45464,7 @@
  if test "${ac_cv_have_decl_DPMSCapable+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -42893,6 +43620,7 @@
+@@ -42893,6 +46682,7 @@
  {
  #ifndef DPMSCapable
    char *p = (char *) DPMSCapable;
@@ -34117,7 +45472,52 @@
  #endif
  
    ;
-@@ -42926,12 +43654,13 @@
+@@ -42900,24 +46690,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -42926,12 +46728,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34134,7 +45534,7 @@
  if test $ac_cv_have_decl_DPMSCapable = yes; then
    cat >>confdefs.h <<\_ACEOF
  #define HAVE_DPMSCAPABLE_PROTO 1
-@@ -42941,8 +43670,8 @@
+@@ -42941,8 +46744,8 @@
  
  
  
@@ -34145,7 +45545,7 @@
  if test "${ac_cv_have_decl_DPMSInfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -42960,6 +43689,7 @@
+@@ -42960,6 +46763,7 @@
  {
  #ifndef DPMSInfo
    char *p = (char *) DPMSInfo;
@@ -34153,7 +45553,52 @@
  #endif
  
    ;
-@@ -42993,12 +43723,13 @@
+@@ -42967,24 +46771,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -42993,12 +46809,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34170,7 +45615,7 @@
  if test $ac_cv_have_decl_DPMSInfo = yes; then
    cat >>confdefs.h <<\_ACEOF
  #define HAVE_DPMSINFO_PROTO 1
-@@ -43012,14 +43743,14 @@
+@@ -43012,14 +46829,14 @@
  
  
  
@@ -34188,7 +45633,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -43062,18 +43793,18 @@
+@@ -43062,18 +46879,18 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34212,7 +45657,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -43116,23 +43847,23 @@
+@@ -43116,23 +46933,23 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34242,7 +45687,7 @@
        FONTCONFIG_CONFIG=$kde_cv_path
  
     fi
-@@ -43196,8 +43927,8 @@
+@@ -43196,8 +47013,8 @@
  
  case "$host" in
    *-*-osf*)
@@ -34253,7 +45698,7 @@
  if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -43210,17 +43941,17 @@
+@@ -43210,40 +47027,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -34275,7 +45720,50 @@
    ;
    return 0;
  }
-@@ -43252,14 +43983,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -43252,14 +47081,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34294,7 +45782,7 @@
  if test $ac_cv_lib_mach_vm_statistics = yes; then
    LIB_TRU64_MACH="-lmach"
  fi
-@@ -43270,18 +44002,19 @@
+@@ -43270,18 +47100,19 @@
  for ac_header in linux/raw.h sys/raw.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34322,7 +45810,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -43318,15 +44051,16 @@
+@@ -43292,24 +47123,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -43318,15 +47161,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34344,7 +45877,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -43360,9 +44094,10 @@
+@@ -43335,8 +47179,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -43360,9 +47209,10 @@
  
    ac_header_preproc=no
  fi
@@ -34357,7 +45906,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -43386,25 +44121,19 @@
+@@ -43386,25 +47236,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -34390,7 +45939,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -43421,18 +44150,19 @@
+@@ -43421,18 +47265,19 @@
  for ac_header in devinfo.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34418,7 +45967,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -43469,15 +44199,16 @@
+@@ -43443,24 +47288,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -43469,15 +47326,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34440,7 +46034,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -43511,9 +44242,10 @@
+@@ -43486,8 +47344,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -43511,9 +47374,10 @@
  
    ac_header_preproc=no
  fi
@@ -34453,7 +46063,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -43537,25 +44269,19 @@
+@@ -43537,25 +47401,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -34486,7 +46096,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -43567,8 +44293,8 @@
+@@ -43567,8 +47425,8 @@
  
  done
  
@@ -34497,7 +46107,7 @@
  if test "${ac_cv_lib_devinfo_devinfo_foreach_rman+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -43581,17 +44307,17 @@
+@@ -43581,40 +47439,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -34519,7 +46129,50 @@
    ;
    return 0;
  }
-@@ -43623,14 +44349,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -43623,14 +47493,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34538,7 +46191,7 @@
  if test $ac_cv_lib_devinfo_devinfo_foreach_rman = yes; then
    LIBDEVINFO="-ldevinfo"
  fi
-@@ -43645,28 +44372,27 @@
+@@ -43645,28 +47516,27 @@
   test -z "$GL_INCLUDE" && GL_INCLUDE=
  
  
@@ -34574,7 +46227,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -43728,8 +44454,9 @@
+@@ -43702,24 +47572,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -43728,8 +47610,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34585,7 +46283,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
-@@ -43745,8 +44472,8 @@
+@@ -43745,8 +47628,8 @@
  fi
  
    if test "$ac_cv_have_gl" = "no"; then
@@ -34596,7 +46294,7 @@
      GL_LDFLAGS=""
      GLINC=""
      have_gl=no
-@@ -43766,8 +44493,8 @@
+@@ -43766,8 +47649,8 @@
      else
         GLINC="-I$GL_INCLUDE"
      fi
@@ -34607,7 +46305,7 @@
      have_gl=yes
    fi
   fi
-@@ -43786,15 +44513,14 @@
+@@ -43786,15 +47669,14 @@
  
  
  
@@ -34626,7 +46324,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -43848,8 +44574,9 @@
+@@ -43822,24 +47704,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -43848,8 +47742,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34637,7 +46380,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    ac_ext=c
-@@ -43861,8 +44588,8 @@
+@@ -43861,8 +47756,8 @@
  
  fi
  
@@ -34648,7 +46391,7 @@
  if test "$kde_cv_c_long_long" = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -43873,13 +44600,13 @@
+@@ -43873,13 +47768,13 @@
  
  
  
@@ -34666,7 +46409,7 @@
  
  USB_LIBS=
  USB_CFLAGS=
-@@ -43887,8 +44614,8 @@
+@@ -43887,8 +47782,8 @@
  if test "x$with_libusb" != xno; then
      # Extract the first word of "libusb-config", so it can be a program name with args.
  set dummy libusb-config; ac_word=$2
@@ -34677,7 +46420,7 @@
  if test "${ac_cv_path_LIBUSBCONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -43903,34 +44630,35 @@
+@@ -43903,34 +47798,35 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -34721,7 +46464,7 @@
  if test "${ac_cv_lib_usb_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -43948,7 +44676,7 @@
+@@ -43948,30 +47844,42 @@
  int
  main ()
  {
@@ -34730,7 +46473,50 @@
    ;
    return 0;
  }
-@@ -43980,14 +44708,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -43980,14 +47888,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34749,7 +46535,7 @@
  if test $ac_cv_lib_usb_main = yes; then
    have_libusb=yes
  
-@@ -44031,14 +44760,14 @@
+@@ -44031,14 +47940,14 @@
  KFI_FOUND_FREETYPE=0
  
  
@@ -34767,7 +46553,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -44081,15 +44810,15 @@
+@@ -44081,15 +47990,15 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34787,7 +46573,7 @@
        FREETYPE_CONFIG=$kde_cv_path
  
     fi
-@@ -44125,14 +44854,14 @@
+@@ -44125,14 +48034,14 @@
      KFI_FOUND_FONTCONFIG=0
      # check for fontconfig...
  
@@ -34805,7 +46591,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -44175,18 +44904,18 @@
+@@ -44175,18 +48084,18 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34829,7 +46615,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -44229,23 +44958,23 @@
+@@ -44229,23 +48138,23 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34859,7 +46645,7 @@
        FONTCONFIG_CONFIG=$kde_cv_path
  
     fi
-@@ -44293,8 +45022,8 @@
+@@ -44293,8 +48202,8 @@
  
  
          # Check OS...
@@ -34870,7 +46656,7 @@
          case "$host" in
              *-*-linux*) UNAME='Linux' ;;
              *-*-freebsd*) UNAME='FreeBSD' ;;
-@@ -44307,8 +45036,8 @@
+@@ -44307,8 +48216,8 @@
              *-*-darwin*) UNAME='Darwin' ;;
              *) UNAME='Unknown' ;;
              esac
@@ -34881,7 +46667,7 @@
  
  
          # Check for fontenc...
-@@ -44317,8 +45046,7 @@
+@@ -44317,8 +48226,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -34891,7 +46677,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -44328,17 +45056,17 @@
+@@ -44328,17 +48236,17 @@
  
  
     if test "${ac_cv_header_X11_fonts_fontenc_h+set}" = set; then
@@ -34915,7 +46701,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -44375,15 +45103,16 @@
+@@ -44349,24 +48257,36 @@
+ #include <X11/fonts/fontenc.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -44375,15 +48295,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34937,7 +46768,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -44417,9 +45146,10 @@
+@@ -44392,8 +48313,13 @@
+ /* end confdefs.h.  */
+ #include <X11/fonts/fontenc.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -44417,9 +48343,10 @@
  
    ac_header_preproc=no
  fi
@@ -34950,7 +46797,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -44443,25 +45173,18 @@
+@@ -44443,25 +48370,18 @@
  echo "$as_me: WARNING: X11/fonts/fontenc.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: X11/fonts/fontenc.h: in the future, the compiler will take precedence" >&2;}
@@ -34981,7 +46828,7 @@
  
  fi
  if test $ac_cv_header_X11_fonts_fontenc_h = yes; then
-@@ -44484,16 +45207,15 @@
+@@ -44484,16 +48404,15 @@
              ac_LDFLAGS_save="$LDFLAGS"
              ld_shared_flag=
  
@@ -35002,7 +46849,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -44546,7 +45268,9 @@
+@@ -44520,24 +48439,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -44546,7 +48477,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35012,7 +46904,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -44560,13 +45284,13 @@
+@@ -44560,13 +48493,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35030,7 +46922,7 @@
   :
  
  fi
-@@ -44581,8 +45305,8 @@
+@@ -44581,8 +48514,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -35041,7 +46933,7 @@
  if test "${ac_cv_lib_fontenc_FontEncDirectory+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -44595,17 +45319,17 @@
+@@ -44595,40 +48528,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -35063,7 +46955,50 @@
    ;
    return 0;
  }
-@@ -44637,14 +45361,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -44637,14 +48582,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35082,7 +47017,7 @@
  if test $ac_cv_lib_fontenc_FontEncDirectory = yes; then
    ac_font_enc_lib=1
  else
-@@ -44677,17 +45402,17 @@
+@@ -44677,17 +48623,17 @@
          CPPFLAGS="$CXXFLAGS"
  
          if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
@@ -35106,7 +47041,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -44724,15 +45449,16 @@
+@@ -44698,24 +48644,36 @@
+ #include <X11/Xft/Xft.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -44724,15 +48682,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35128,7 +47108,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -44766,9 +45492,10 @@
+@@ -44741,8 +48700,13 @@
+ /* end confdefs.h.  */
+ #include <X11/Xft/Xft.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -44766,9 +48730,10 @@
  
    ac_header_preproc=no
  fi
@@ -35141,7 +47137,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -44792,25 +45519,18 @@
+@@ -44792,25 +48757,18 @@
  echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;}
@@ -35172,7 +47168,7 @@
  
  fi
  if test $ac_cv_header_X11_Xft_Xft_h = yes; then
-@@ -44872,9 +45592,9 @@
+@@ -44872,9 +48830,9 @@
  for ac_func in getifaddrs getnameinfo
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -35185,7 +47181,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -44900,30 +45620,24 @@
+@@ -44900,53 +48858,59 @@
  
  #undef $ac_func
  
@@ -35221,7 +47217,50 @@
    ;
    return 0;
  }
-@@ -44955,13 +45669,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -44955,13 +48919,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35240,7 +47279,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -44970,8 +45686,8 @@
+@@ -44970,8 +48936,8 @@
  fi
  done
  
@@ -35251,7 +47290,52 @@
  if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -45022,7 +45738,7 @@
+@@ -44996,24 +48962,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -45022,7 +49000,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35260,7 +47344,52 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -45069,14 +45785,16 @@
+@@ -45043,24 +49021,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -45069,14 +49059,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35280,7 +47409,7 @@
  if test $ac_cv_member_struct_sockaddr_sa_len = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -45092,10 +45810,9 @@
+@@ -45092,10 +49084,9 @@
  
  
  
@@ -35292,7 +47421,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -45108,9 +45825,9 @@
+@@ -45108,9 +49099,9 @@
  for ac_header in X11/extensions/Xrandr.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -35305,7 +47434,52 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -45150,12 +45867,14 @@
+@@ -45124,24 +49115,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -45150,12 +49153,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35323,7 +47497,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -45185,8 +45904,8 @@
+@@ -45185,8 +49190,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -35334,7 +47508,7 @@
  if test "${ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -45199,17 +45918,17 @@
+@@ -45199,40 +49204,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -35356,7 +47530,50 @@
    ;
    return 0;
  }
-@@ -45241,14 +45960,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -45241,14 +49258,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35375,7 +47592,7 @@
  if test $ac_cv_lib_Xrandr_XRRSetScreenConfigAndRate = yes; then
    LIB_XRANDR=-lXrandr
  
-@@ -45287,28 +46007,27 @@
+@@ -45287,28 +49305,27 @@
   test -z "$GL_INCLUDE" && GL_INCLUDE=
  
  
@@ -35411,7 +47628,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -45370,8 +46089,9 @@
+@@ -45344,24 +49361,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -45370,8 +49399,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35422,7 +47684,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
-@@ -45387,8 +46107,8 @@
+@@ -45387,8 +49417,8 @@
  fi
  
    if test "$ac_cv_have_gl" = "no"; then
@@ -35433,7 +47695,7 @@
      GL_LDFLAGS=""
      GLINC=""
  
-@@ -45409,11 +46129,11 @@
+@@ -45409,11 +49439,11 @@
      else
         GLINC="-I$GL_INCLUDE"
      fi
@@ -35449,7 +47711,7 @@
  if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -45426,17 +46146,17 @@
+@@ -45426,40 +49456,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -35471,7 +47733,50 @@
    ;
    return 0;
  }
-@@ -45468,14 +46188,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -45468,14 +49510,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35490,7 +47795,7 @@
  if test $ac_cv_lib_GL_glXChooseVisual = yes; then
  
  
-@@ -45498,8 +46219,7 @@
+@@ -45498,8 +49541,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -35500,7 +47805,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -45509,17 +46229,17 @@
+@@ -45509,17 +49551,17 @@
  
  
     if test "${ac_cv_header_kcarddb_h+set}" = set; then
@@ -35524,7 +47829,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -45556,15 +46276,16 @@
+@@ -45530,24 +49572,36 @@
+ #include <kcarddb.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -45556,15 +49610,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35546,7 +47896,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -45598,9 +46319,10 @@
+@@ -45573,8 +49628,13 @@
+ /* end confdefs.h.  */
+ #include <kcarddb.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -45598,9 +49658,10 @@
  
    ac_header_preproc=no
  fi
@@ -35559,7 +47925,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -45624,25 +46346,18 @@
+@@ -45624,25 +49685,18 @@
  echo "$as_me: WARNING: kcarddb.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: kcarddb.h: in the future, the compiler will take precedence" >&2;}
@@ -35590,7 +47956,7 @@
  
  fi
  if test $ac_cv_header_kcarddb_h = yes; then
-@@ -45689,11 +46404,11 @@
+@@ -45689,11 +49743,11 @@
  
  
  
@@ -35605,7 +47971,7 @@
  
  if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
  
-@@ -45716,13 +46431,13 @@
+@@ -45716,13 +49770,13 @@
  
  
  
@@ -35623,7 +47989,7 @@
  
  VIEW1394_SUBDIR=
  if test "x$with_libraw1394" != xno; then
-@@ -45730,8 +46445,7 @@
+@@ -45730,8 +49784,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -35633,7 +47999,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -45741,17 +46455,17 @@
+@@ -45741,17 +49794,17 @@
  
  
     if test "${ac_cv_header_libraw1394_raw1394_h+set}" = set; then
@@ -35657,7 +48023,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -45788,15 +46502,16 @@
+@@ -45762,24 +49815,36 @@
+ #include <libraw1394/raw1394.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -45788,15 +49853,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35679,7 +48090,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -45830,9 +46545,10 @@
+@@ -45805,8 +49871,13 @@
+ /* end confdefs.h.  */
+ #include <libraw1394/raw1394.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -45830,9 +49901,10 @@
  
    ac_header_preproc=no
  fi
@@ -35692,7 +48119,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -45856,25 +46572,18 @@
+@@ -45856,25 +49928,18 @@
  echo "$as_me: WARNING: libraw1394/raw1394.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: libraw1394/raw1394.h: in the future, the compiler will take precedence" >&2;}
@@ -35723,7 +48150,7 @@
  
  fi
  if test $ac_cv_header_libraw1394_raw1394_h = yes; then
-@@ -45915,9 +46624,9 @@
+@@ -45915,9 +49980,9 @@
  for ac_func in sigset sigaction
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -35736,7 +48163,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -45943,30 +46652,24 @@
+@@ -45943,53 +50008,59 @@
  
  #undef $ac_func
  
@@ -35772,7 +48199,50 @@
    ;
    return 0;
  }
-@@ -45998,13 +46701,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -45998,13 +50069,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35791,7 +48261,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -46020,19 +46725,18 @@
+@@ -46020,19 +50093,18 @@
  LIB_XSS=
  
  
@@ -35815,7 +48285,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46041,8 +46745,8 @@
+@@ -46041,8 +50113,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -35826,7 +48296,52 @@
  if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -46085,16 +46789,17 @@
+@@ -46059,24 +50131,36 @@
+ #include <X11/extensions/scrnsaver.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46085,16 +50169,17 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35849,7 +48364,7 @@
  if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -46107,17 +46812,17 @@
+@@ -46107,40 +50192,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -35871,7 +48386,50 @@
    ;
    return 0;
  }
-@@ -46149,14 +46854,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46149,14 +50246,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35890,7 +48448,7 @@
  if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
  
  
-@@ -46172,16 +46878,15 @@
+@@ -46172,16 +50270,15 @@
          xss_save_cxxflags="$CXXFLAGS"
          CXXFLAGS="$CXXFLAGS $lt_prog_compiler_pic_CXX"
  
@@ -35911,7 +48469,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46234,11 +46939,13 @@
+@@ -46208,24 +50305,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46234,11 +50343,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35926,7 +48529,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46248,19 +46955,19 @@
+@@ -46248,19 +50359,19 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35952,7 +48555,7 @@
  if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -46273,17 +46980,17 @@
+@@ -46273,40 +50384,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -35974,7 +48577,50 @@
    ;
    return 0;
  }
-@@ -46315,14 +47022,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46315,14 +50438,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35993,7 +48639,7 @@
  if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
  
  
-@@ -46364,8 +47072,7 @@
+@@ -46364,8 +50488,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -36003,7 +48649,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46374,8 +47081,8 @@
+@@ -46374,8 +50497,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -36014,7 +48660,52 @@
  if test "${ac_cv_header_X11_extensions_xf86misc_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -46418,16 +47125,17 @@
+@@ -46392,24 +50515,36 @@
+ #include <X11/extensions/xf86misc.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46418,16 +50553,17 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36037,7 +48728,7 @@
  if test "${ac_cv_lib_Xxf86misc_XF86MiscQueryVersion+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -46440,17 +47148,17 @@
+@@ -46440,40 +50576,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -36059,7 +48750,50 @@
    ;
    return 0;
  }
-@@ -46482,14 +47190,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46482,14 +50630,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36078,7 +48812,7 @@
  if test $ac_cv_lib_Xxf86misc_XF86MiscQueryVersion = yes; then
  
  
-@@ -46516,8 +47225,8 @@
+@@ -46516,8 +50665,8 @@
  
  
  if test -n "$LIB_XF86MISC"; then
@@ -36089,7 +48823,7 @@
  if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -46530,17 +47239,17 @@
+@@ -46530,40 +50679,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -36111,7 +48845,50 @@
    ;
    return 0;
  }
-@@ -46572,14 +47281,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46572,14 +50733,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36130,7 +48907,7 @@
  if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then
  
  
-@@ -46600,28 +47310,27 @@
+@@ -46600,28 +50762,27 @@
   test -z "$GL_INCLUDE" && GL_INCLUDE=
  
  
@@ -36166,7 +48943,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -46683,8 +47392,9 @@
+@@ -46657,24 +50818,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46683,8 +50856,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36177,7 +48999,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
-@@ -46700,8 +47410,8 @@
+@@ -46700,8 +50874,8 @@
  fi
  
    if test "$ac_cv_have_gl" = "no"; then
@@ -36188,7 +49010,7 @@
      GL_LDFLAGS=""
      GLINC=""
  
-@@ -46722,11 +47432,11 @@
+@@ -46722,11 +50896,11 @@
      else
         GLINC="-I$GL_INCLUDE"
      fi
@@ -36204,7 +49026,7 @@
  if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -46739,17 +47449,17 @@
+@@ -46739,40 +50913,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -36226,7 +49048,50 @@
    ;
    return 0;
  }
-@@ -46781,14 +47491,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46781,14 +50967,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36245,7 +49110,7 @@
  if test $ac_cv_lib_GL_glXChooseVisual = yes; then
  
  
-@@ -46806,8 +47517,8 @@
+@@ -46806,8 +50993,8 @@
  
  
  
@@ -36256,7 +49121,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -46829,15 +47540,15 @@
+@@ -46829,15 +51016,15 @@
  #define HAVE_STRUCT_UCRED 1
  _ACEOF
  
@@ -36278,7 +49143,61 @@
  if test "$cross_compiling" = yes; then
    nogroup=65534
  else
-@@ -46918,21 +47629,25 @@
+@@ -46860,13 +51047,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46899,13 +51095,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -46918,21 +51123,25 @@
  ( exit $ac_status )
  nogroup=65534
  fi
@@ -36311,7 +49230,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -46958,30 +47673,24 @@
+@@ -46958,53 +51167,59 @@
  
  #undef $ac_func
  
@@ -36347,7 +49266,50 @@
    ;
    return 0;
  }
-@@ -47013,13 +47722,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47013,13 +51228,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36366,7 +49328,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47030,14 +47741,14 @@
+@@ -47030,14 +51247,14 @@
  
  
  
@@ -36384,7 +49346,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -47080,21 +47791,21 @@
+@@ -47080,21 +51297,21 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36412,7 +49374,7 @@
  imkv=8
  test "$kde_cv_defines_imake_version" = $imkv || unset kde_cv_defines_imake
  if test "${kde_cv_defines_imake+set}" = set; then
-@@ -47114,8 +47825,8 @@
+@@ -47114,8 +51331,8 @@
  	kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
  	kde_cv_defines_imake_version=$imkv
      else
@@ -36423,7 +49385,7 @@
  	{ { echo "$as_me:$LINENO: error: $XMKMF (imake) failed.
  Make sure you have all necessary X development packages installed.
  On some systems a missing /lib/cpp symlink is at fault." >&5
-@@ -47127,8 +47838,8 @@
+@@ -47127,8 +51344,8 @@
      cd ..
      rm -fr conftestdir
    else
@@ -36434,7 +49396,7 @@
      { { echo "$as_me:$LINENO: error: cannot create temporary directory" >&5
  echo "$as_me: error: cannot create temporary directory" >&2;}
     { (exit 1); exit 1; }; }
-@@ -47136,8 +47847,8 @@
+@@ -47136,8 +51353,8 @@
  
  fi
  
@@ -36445,7 +49407,7 @@
  eval "$kde_cv_defines_imake"
  
  cat >>confdefs.h <<_ACEOF
-@@ -47162,9 +47873,9 @@
+@@ -47162,9 +51379,9 @@
  for ac_func in getttyent
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36458,7 +49420,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -47190,30 +47901,24 @@
+@@ -47190,53 +51407,59 @@
  
  #undef $ac_func
  
@@ -36494,7 +49456,50 @@
    ;
    return 0;
  }
-@@ -47245,13 +47950,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47245,13 +51468,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36513,7 +49518,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47264,8 +47971,8 @@
+@@ -47264,8 +51489,8 @@
  	linux*) ac_cv_func_getutxent=no;;
  	darwin*) ac_cv_func_getutxent=no;;
  	kfreebsd*-gnu) ac_cv_func_getutxent=no;;
@@ -36524,7 +49529,7 @@
  if test "${ac_cv_func_getutxent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -47292,30 +47999,24 @@
+@@ -47292,53 +51517,59 @@
  
  #undef getutxent
  
@@ -36560,7 +49565,50 @@
    ;
    return 0;
  }
-@@ -47347,13 +48048,14 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47347,13 +51578,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36578,7 +49626,7 @@
  ;;
  esac
  if test $ac_cv_func_getutxent = yes; then
-@@ -47363,8 +48065,8 @@
+@@ -47363,8 +51595,8 @@
  _ACEOF
  
  else
@@ -36589,7 +49637,7 @@
  if test "${ac_cv_func_getutent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -47391,30 +48093,24 @@
+@@ -47391,53 +51623,59 @@
  
  #undef getutent
  
@@ -36625,7 +49673,50 @@
    ;
    return 0;
  }
-@@ -47446,13 +48142,14 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47446,13 +51684,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36643,7 +49734,7 @@
  if test $ac_cv_func_getutent = yes; then
    :
  else
-@@ -47465,8 +48162,8 @@
+@@ -47465,8 +51704,8 @@
  
  fi
  
@@ -36654,7 +49745,52 @@
  if test "${ac_cv_member_struct_utmp_ut_user+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -47515,7 +48212,7 @@
+@@ -47489,24 +51728,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47515,7 +51766,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36663,7 +49799,52 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -47560,14 +48257,16 @@
+@@ -47534,24 +51785,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47560,14 +51823,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36683,7 +49864,7 @@
  if test $ac_cv_member_struct_utmp_ut_user = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -47577,8 +48276,8 @@
+@@ -47577,8 +51842,8 @@
  
  fi
  
@@ -36694,7 +49875,52 @@
  if test "${ac_cv_member_struct_passwd_pw_expire+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -47627,7 +48326,7 @@
+@@ -47601,24 +51866,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47627,7 +51904,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36703,7 +49929,52 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -47672,14 +48371,16 @@
+@@ -47646,24 +51923,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47672,14 +51961,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36723,7 +49994,7 @@
  if test $ac_cv_member_struct_passwd_pw_expire = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -47689,8 +48390,8 @@
+@@ -47689,8 +51980,8 @@
  
  fi
  
@@ -36734,7 +50005,52 @@
  if test "${ac_cv_member_struct_sockaddr_in_sin_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -47742,7 +48443,7 @@
+@@ -47716,24 +52007,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47742,7 +52045,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36743,7 +50059,52 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -47790,14 +48491,16 @@
+@@ -47764,24 +52067,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47790,14 +52105,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36763,7 +50124,7 @@
  if test $ac_cv_member_struct_sockaddr_in_sin_len = yes; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -47818,9 +48521,9 @@
+@@ -47818,9 +52135,9 @@
  for ac_func in setlogin setusercontext getusershell login_getclass auth_timeok
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36776,7 +50137,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -47846,30 +48549,24 @@
+@@ -47846,53 +52163,59 @@
  
  #undef $ac_func
  
@@ -36812,7 +50173,50 @@
    ;
    return 0;
  }
-@@ -47901,13 +48598,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -47901,13 +52224,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36831,7 +50235,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -47926,9 +48625,9 @@
+@@ -47926,9 +52251,9 @@
  for ac_func in mkstemp setproctitle sysinfo strnlen getifaddrs
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36844,7 +50248,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -47954,30 +48653,24 @@
+@@ -47954,53 +52279,59 @@
  
  #undef $ac_func
  
@@ -36880,7 +50284,50 @@
    ;
    return 0;
  }
-@@ -48009,13 +48702,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48009,13 +52340,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36899,7 +50346,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -48029,9 +48724,9 @@
+@@ -48029,9 +52362,9 @@
  for ac_func in arc4random
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -36912,7 +50359,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -48057,30 +48752,24 @@
+@@ -48057,53 +52390,59 @@
  
  #undef $ac_func
  
@@ -36948,7 +50395,50 @@
    ;
    return 0;
  }
-@@ -48112,13 +48801,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48112,13 +52451,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36967,7 +50457,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -48141,8 +48832,8 @@
+@@ -48141,8 +52482,8 @@
  done
  
  
@@ -36978,7 +50468,7 @@
  if test "${ac_cv_func_vsyslog+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48169,30 +48860,24 @@
+@@ -48169,53 +52510,59 @@
  
  #undef vsyslog
  
@@ -37014,7 +50504,50 @@
    ;
    return 0;
  }
-@@ -48224,13 +48909,14 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48224,13 +52571,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37032,7 +50565,7 @@
  if test $ac_cv_func_vsyslog = yes; then
  
  
-@@ -48244,8 +48930,8 @@
+@@ -48244,8 +52592,8 @@
  kdm_no_Xau=false
  kdm_no_Xdmcp=false
  
@@ -37043,7 +50576,7 @@
  if test "${ac_cv_lib_Xau_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48262,7 +48948,7 @@
+@@ -48262,30 +52610,42 @@
  int
  main ()
  {
@@ -37052,7 +50585,50 @@
    ;
    return 0;
  }
-@@ -48294,14 +48980,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48294,14 +52654,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37071,7 +50647,7 @@
  if test $ac_cv_lib_Xau_main = yes; then
    :
  else
-@@ -48313,16 +49000,16 @@
+@@ -48313,16 +52674,16 @@
  
  
  
@@ -37094,7 +50670,7 @@
  if test "${ac_cv_lib_Xdmcp_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48339,7 +49026,7 @@
+@@ -48339,30 +52700,42 @@
  int
  main ()
  {
@@ -37103,7 +50679,50 @@
    ;
    return 0;
  }
-@@ -48371,14 +49058,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48371,14 +52744,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37122,7 +50741,7 @@
  if test $ac_cv_lib_Xdmcp_main = yes; then
    LIBXDMCP="-lXdmcp"
  fi
-@@ -48386,8 +49074,8 @@
+@@ -48386,8 +52760,8 @@
    if test -n "$LIBXDMCP"; then
      cppflags_safe=$CPPFLAGS
      CPPFLAGS="$CPPFLAGS $X_INCLUDES"
@@ -37133,7 +50752,52 @@
  if test "${ac_cv_header_X11_Xdmcp_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48428,12 +49116,13 @@
+@@ -48402,24 +52776,36 @@
+ #include <X11/Xdmcp.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48428,12 +52814,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37150,7 +50814,7 @@
  if test $ac_cv_header_X11_Xdmcp_h = yes; then
    HAVE_X11_XDMCP_H=1
  fi
-@@ -48452,8 +49141,8 @@
+@@ -48452,8 +52839,8 @@
  
    ac_save_libs=$LIBS
    LIBS="$LIBS $LIBXDMCP"
@@ -37161,7 +50825,7 @@
  if test "${ac_cv_func_XdmcpWrap+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48480,30 +49169,24 @@
+@@ -48480,53 +52867,59 @@
  
  #undef XdmcpWrap
  
@@ -37197,7 +50861,50 @@
    ;
    return 0;
  }
-@@ -48535,13 +49218,14 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48535,13 +52928,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37215,7 +50922,7 @@
  if test $ac_cv_func_XdmcpWrap = yes; then
  
  
-@@ -48560,25 +49244,25 @@
+@@ -48560,25 +52954,25 @@
  KRB4_LIBS=
  KRB4_RPATH=
  
@@ -37251,7 +50958,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KRB4 1
-@@ -48589,8 +49273,8 @@
+@@ -48589,8 +52983,8 @@
    if test "$USE_RPATH" = "yes" ; then
      KRB4_RPATH="-R $with_krb4/lib"
    fi
@@ -37262,7 +50969,7 @@
  if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48603,17 +49287,17 @@
+@@ -48603,40 +52997,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37284,7 +50991,50 @@
    ;
    return 0;
  }
-@@ -48645,14 +49329,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48645,14 +53051,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37303,7 +51053,7 @@
  if test $ac_cv_lib_resolv_dn_expand = yes; then
    KRB4_LIBS="$KRB4_LIBS -lresolv"
  fi
-@@ -48660,29 +49345,29 @@
+@@ -48660,29 +53067,29 @@
    ;;
  esac
  
@@ -37345,7 +51095,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define AFS 1
-@@ -48699,8 +49384,8 @@
+@@ -48699,8 +53106,8 @@
  
  
  
@@ -37356,7 +51106,7 @@
  if test "${ac_cv_lib_s_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48717,7 +49402,7 @@
+@@ -48717,30 +53124,42 @@
  int
  main ()
  {
@@ -37365,7 +51115,50 @@
    ;
    return 0;
  }
-@@ -48749,21 +49434,22 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48749,21 +53168,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37393,7 +51186,7 @@
  if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48776,17 +49462,17 @@
+@@ -48776,40 +53196,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37415,7 +51208,50 @@
    ;
    return 0;
  }
-@@ -48818,14 +49504,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48818,14 +53250,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37434,7 +51270,7 @@
  if test $ac_cv_lib_posix4_sched_yield = yes; then
    LIBPOSIX4=-lposix4
  fi
-@@ -48836,22 +49523,22 @@
+@@ -48836,22 +53269,22 @@
  KRB5_LIBS=
  KRB5_RPATH=
  
@@ -37467,7 +51303,7 @@
    if test "x$with_krb5auth" != xyes; then
      KRB5_INCS="-I$with_krb5auth/include"
      KRB5_LIBS="-L$with_krb5auth/lib"
-@@ -48862,17 +49549,17 @@
+@@ -48862,17 +53295,17 @@
    KRB5_LIBS="$KRB5_LIBS -lkrb5"   keepcflags=$CFLAGS
    CFLAGS="$KRB5_INCS $CFLAGS"
    if test "${ac_cv_header_krb5_krb5_h+set}" = set; then
@@ -37491,7 +51327,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -48909,15 +49596,16 @@
+@@ -48883,24 +53316,36 @@
+ #include <krb5/krb5.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -48909,15 +53354,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37513,7 +51394,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -48951,9 +49639,10 @@
+@@ -48926,8 +53372,13 @@
+ /* end confdefs.h.  */
+ #include <krb5/krb5.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -48951,9 +53402,10 @@
  
    ac_header_preproc=no
  fi
@@ -37526,7 +51423,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -48977,25 +49666,18 @@
+@@ -48977,25 +53429,18 @@
  echo "$as_me: WARNING: krb5/krb5.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: krb5/krb5.h: in the future, the compiler will take precedence" >&2;}
@@ -37557,7 +51454,7 @@
  
  fi
  if test $ac_cv_header_krb5_krb5_h = yes; then
-@@ -49022,34 +49704,34 @@
+@@ -49022,34 +53467,34 @@
  
  
  
@@ -37608,7 +51505,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -49086,15 +49768,16 @@
+@@ -49060,24 +53505,36 @@
+ #include <rpc/rpc.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -49086,15 +53543,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37630,7 +51572,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -49128,9 +49811,10 @@
+@@ -49103,8 +53561,13 @@
+ /* end confdefs.h.  */
+ #include <rpc/rpc.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -49128,9 +53591,10 @@
  
    ac_header_preproc=no
  fi
@@ -37643,7 +51601,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -49154,25 +49838,18 @@
+@@ -49154,25 +53618,18 @@
  echo "$as_me: WARNING: rpc/rpc.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: rpc/rpc.h: in the future, the compiler will take precedence" >&2;}
@@ -37674,126 +51632,286 @@
  
  fi
  if test $ac_cv_header_rpc_rpc_h = yes; then
-@@ -49219,13 +49896,13 @@
- fi
+@@ -49211,136 +53668,41 @@
  
+     if test "x$with_afs" = xno; then
  
+-cat >>confdefs.h <<\_ACEOF
+-#define NO_AFS 1
+-_ACEOF
+-
+-    fi
+-fi
+-
+-
 -# Check whether --with-kdm-xconsole or --without-kdm-xconsole was given.
-+# Check whether --with-kdm-xconsole was given.
- if test "${with_kdm_xconsole+set}" = set; then
+-if test "${with_kdm_xconsole+set}" = set; then
 -  withval="$with_kdm_xconsole"
 -
-+  withval=$with_kdm_xconsole;
- else
-   with_kdm_xconsole=no
+-else
+-  with_kdm_xconsole=no
 -fi;
-+fi
-+
- if test "x$with_kdm_xconsole" = xyes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -49237,16 +49914,15 @@
- 
- 
- 
+-if test "x$with_kdm_xconsole" = xyes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define WITH_KDM_XCONSOLE 1
+-_ACEOF
+-
+-fi
+-
+-
+-
+-
 -echo "$as_me:$LINENO: checking if covariant return works" >&5
 -echo $ECHO_N "checking if covariant return works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking if covariant return works" >&5
-+echo $ECHO_N "checking if covariant return works... $ECHO_C" >&6; }
- if test "${kde_cv_covariant_return+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-     kde_cv_covariant_return=no
- 
+-if test "${kde_cv_covariant_return+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 -
+-    kde_cv_covariant_return=no
+-
+-
 -     ac_ext=cc
-+     ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -49304,8 +49980,10 @@
- sed 's/^/| /' conftest.$ac_ext >&5
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-
+-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-
+-
+-    if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-        class A { public: virtual A* me(); };
+-        class X { public: int x; virtual void ff() {}; };
+-        class B : public X, public A { public: virtual B* me(); };
+-        int foo( A* a )
+-            {
+-            A* aa = a->me();
+-            return a == aa;
+-            }
+-        int main()
+-            {
+-            B* b = new B;
+-            return foo( b ) == 0;
+-            }
+-        A* A::me() { return this; }
+-        B* B::me() { return this; }
+-
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   kde_cv_covariant_return=yes
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-    ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
++cat >>confdefs.h <<\_ACEOF
++#define NO_AFS 1
++_ACEOF
  
++    fi
  fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
-     ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -49317,30 +49995,29 @@
  
  
- if test "$kde_cv_covariant_return" = "no"; then
+-if test "$kde_cv_covariant_return" = "no"; then
 -    echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++# Check whether --with-kdm-xconsole was given.
++if test "${with_kdm_xconsole+set}" = set; then
++  withval=$with_kdm_xconsole;
++else
++  with_kdm_xconsole=no
++fi
++
++if test "x$with_kdm_xconsole" = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
- #define COVARIANT_RETURN_BROKEN 1
+-#define COVARIANT_RETURN_BROKEN 1
++#define WITH_KDM_XCONSOLE 1
  _ACEOF
  
- else
+-else
 -    echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+    { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
  fi
  
  
  
 -echo "$as_me:$LINENO: checking for working using" >&5
 -echo $ECHO_N "checking for working using... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for working using" >&5
-+echo $ECHO_N "checking for working using... $ECHO_C" >&6; }
- if test "${kde_cv_working_using+set}" = set; then
+-if test "${kde_cv_working_using+set}" = set; then
++
++{ echo "$as_me:$LINENO: checking if covariant return works" >&5
++echo $ECHO_N "checking if covariant return works... $ECHO_C" >&6; }
++if test "${kde_cv_covariant_return+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-     kde_cv_working_using=no
+-    kde_cv_working_using=no
+-
++    kde_cv_covariant_return=no
  
--
 -     ac_ext=cc
 +     ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -49394,7 +50071,9 @@
-   echo "$as_me: failed program was:" >&5
+@@ -49349,53 +53711,68 @@
+ ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ 
+ 
+-    cat >conftest.$ac_ext <<_ACEOF
++    if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-int
+-main ()
+-{
+-
+-        class A { public: void foo( int ); };
+-        class B : public A { public: using A::foo; void foo( char ); };
++        class A { public: virtual A* me(); };
++        class X { public: int x; virtual void ff() {}; };
++        class B : public X, public A { public: virtual B* me(); };
++        int foo( A* a )
++            {
++            A* aa = a->me();
++            return a == aa;
++            }
++        int main()
++            {
++            B* b = new B;
++            return foo( b ) == 0;
++            }
++        A* A::me() { return this; }
++        B* B::me() { return this; }
+ 
+-  ;
+-  return 0;
+-}
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++rm -f conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-   kde_cv_working_using=yes
++   kde_cv_covariant_return=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-+
  fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
 +
- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
      ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -49407,16 +50086,16 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -49406,17 +53783,17 @@
+ fi
  
  
- if test "$kde_cv_working_using" = "yes"; then
+-if test "$kde_cv_working_using" = "yes"; then
 -    echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+    { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
++if test "$kde_cv_covariant_return" = "no"; then
++    { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
  
  cat >>confdefs.h <<\_ACEOF
- #define HAVE_WORKING_USING 1
+-#define HAVE_WORKING_USING 1
++#define COVARIANT_RETURN_BROKEN 1
  _ACEOF
  
  else
 -    echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++    { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
  fi
  
  
-@@ -49425,8 +50104,8 @@
+@@ -49425,8 +53802,8 @@
  artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH
  # Extract the first word of "artsc-config", so it can be a program name with args.
  set dummy artsc-config; ac_word=$2
@@ -37804,7 +51922,7 @@
  if test "${ac_cv_path_ARTSCCONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -49441,29 +50120,30 @@
+@@ -49441,29 +53818,30 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -37841,7 +51959,7 @@
  if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
  	LIB_ARTS="-lartskde"
  	ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix`
-@@ -49494,18 +50174,19 @@
+@@ -49494,18 +53872,19 @@
  for ac_header in sys/loadavg.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37869,7 +51987,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -49542,15 +50223,16 @@
+@@ -49516,24 +53895,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -49542,15 +53933,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37891,7 +52054,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -49584,9 +50266,10 @@
+@@ -49559,8 +53951,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -49584,9 +53981,10 @@
  
    ac_header_preproc=no
  fi
@@ -37904,7 +52083,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -49610,25 +50293,19 @@
+@@ -49610,25 +54008,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -37937,7 +52116,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -49646,8 +50323,7 @@
+@@ -49646,8 +54038,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -37947,7 +52126,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -49656,8 +50332,8 @@
+@@ -49656,8 +54047,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -37958,7 +52137,52 @@
  if test "${ac_cv_header_X11_extensions_Xcomposite_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -49698,12 +50374,13 @@
+@@ -49672,24 +54063,36 @@
+ #include <X11/extensions/Xcomposite.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -49698,12 +54101,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37975,7 +52199,7 @@
  if test $ac_cv_header_X11_extensions_Xcomposite_h = yes; then
    xcomposite_h=yes
  else
-@@ -49729,8 +50406,8 @@
+@@ -49729,8 +54133,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -37986,7 +52210,7 @@
  if test "${ac_cv_lib_Xcomposite_XCompositeQueryExtension+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -49743,17 +50420,17 @@
+@@ -49743,40 +54147,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -38008,7 +52232,50 @@
    ;
    return 0;
  }
-@@ -49785,14 +50462,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -49785,14 +54201,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38027,7 +52294,7 @@
  if test $ac_cv_lib_Xcomposite_XCompositeQueryExtension = yes; then
    LIB_XCOMPOSITE=-lXcomposite
  
-@@ -49816,8 +50494,7 @@
+@@ -49816,8 +54233,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -38037,7 +52304,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -49826,8 +50503,8 @@
+@@ -49826,8 +54242,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -38048,7 +52315,52 @@
  if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -49868,12 +50545,13 @@
+@@ -49842,24 +54258,36 @@
+ #include <X11/extensions/Xfixes.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -49868,12 +54296,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38065,7 +52377,7 @@
  if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
    xfixes_h=yes
  else
-@@ -49899,8 +50577,8 @@
+@@ -49899,8 +54328,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -38076,7 +52388,7 @@
  if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -49913,17 +50591,17 @@
+@@ -49913,40 +54342,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -38098,7 +52410,50 @@
    ;
    return 0;
  }
-@@ -49955,14 +50633,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -49955,14 +54396,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38117,7 +52472,7 @@
  if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
    LIB_XFIXES=-lXfixes
  
-@@ -49989,26 +50668,26 @@
+@@ -49989,26 +54431,26 @@
  ssl_libraries=""
  ssl_includes=""
  
@@ -38154,16 +52509,61 @@
  
  if test "${ac_cv_have_ssl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -50023,7 +50702,7 @@
+@@ -50023,7 +54465,7 @@
  do
    for j in openssl/ssl.h;
    do
 -    echo "configure: 50026: $i/$j" >&5
-+    echo "configure: 50705: $i/$j" >&5
++    echo "configure: 54468: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -50097,9 +50776,10 @@
+@@ -50070,24 +54512,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -50097,9 +54551,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38175,7 +52575,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -50118,26 +50798,26 @@
+@@ -50118,26 +54573,26 @@
  
    eval "$ac_cv_have_ssl"
  
@@ -38215,7 +52615,7 @@
      if test "${ac_cv_ssl_version+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -50210,8 +50890,8 @@
+@@ -50210,8 +54665,8 @@
  
  
    eval "$ac_cv_ssl_version"
@@ -38226,7 +52626,7 @@
  fi
  
  if test "$have_ssl" != yes; then
-@@ -50270,10 +50950,9 @@
+@@ -50270,10 +54725,9 @@
  
  
  
@@ -38238,7 +52638,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50286,18 +50965,19 @@
+@@ -50286,18 +54740,19 @@
  for ac_header in sasl.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38266,7 +52666,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -50334,15 +51014,16 @@
+@@ -50308,24 +54763,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -50334,15 +54801,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38288,7 +52733,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -50376,9 +51057,10 @@
+@@ -50351,8 +54819,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -50376,9 +54849,10 @@
  
    ac_header_preproc=no
  fi
@@ -38301,7 +52762,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -50402,25 +51084,19 @@
+@@ -50402,25 +54876,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -38334,7 +52795,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -50443,10 +51119,9 @@
+@@ -50443,10 +54911,9 @@
  
  
  
@@ -38346,7 +52807,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50459,18 +51134,19 @@
+@@ -50459,18 +54926,19 @@
  for ac_header in sasl/sasl.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38374,7 +52835,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -50507,15 +51183,16 @@
+@@ -50481,24 +54949,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -50507,15 +54987,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38396,7 +52902,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -50549,9 +51226,10 @@
+@@ -50524,8 +55005,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -50549,9 +55035,10 @@
  
    ac_header_preproc=no
  fi
@@ -38409,7 +52931,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -50575,25 +51253,19 @@
+@@ -50575,25 +55062,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -38442,7 +52964,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -50623,8 +51295,8 @@
+@@ -50623,8 +55104,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -38453,7 +52975,7 @@
  if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -50637,17 +51309,17 @@
+@@ -50637,40 +55118,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -38475,7 +52997,50 @@
    ;
    return 0;
  }
-@@ -50679,14 +51351,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -50679,14 +55172,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38494,7 +53059,7 @@
  if test $ac_cv_lib_sasl2_sasl_client_init = yes; then
    SASL2_LIBS="-lsasl2"
  fi
-@@ -50706,15 +51379,14 @@
+@@ -50706,15 +55200,14 @@
  
  
  
@@ -38513,7 +53078,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50772,8 +51444,9 @@
+@@ -50746,24 +55239,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -50772,8 +55277,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38524,7 +53134,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
-@@ -50786,8 +51459,8 @@
+@@ -50786,8 +55292,8 @@
  
  
  fi
@@ -38535,7 +53145,7 @@
  
  if test ! "$ac_cv_lib_bzip2" = no; then
    BZIP2DIR=bzip2
-@@ -50800,16 +51473,15 @@
+@@ -50800,16 +55306,15 @@
     cxx_shared_flag=
     ld_shared_flag=
  
@@ -38556,7 +53166,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50862,7 +51534,9 @@
+@@ -50836,24 +55341,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -50862,7 +55379,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38566,7 +53221,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -50876,30 +51550,29 @@
+@@ -50876,30 +55395,29 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -38605,7 +53260,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -50952,7 +51625,9 @@
+@@ -50926,24 +55444,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -50952,7 +55482,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38615,7 +53315,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
-@@ -50966,29 +51641,28 @@
+@@ -50966,29 +55498,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -38652,7 +53352,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -51047,8 +51721,9 @@
+@@ -51021,24 +55552,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -51047,8 +55590,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38663,7 +53408,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
     LIBS="$kde_save_LIBS"
-@@ -51062,8 +51737,8 @@
+@@ -51062,8 +55606,8 @@
  
  fi
  
@@ -38674,7 +53419,7 @@
  
     if test ! "$ac_cv_lib_bzip2_prefix" = no; then
       BZIP2DIR=bzip2
-@@ -51104,18 +51779,19 @@
+@@ -51104,18 +55648,19 @@
  for ac_header in termios.h pty.h libutil.h util.h sys/types.h sys/ioctl.h stropts.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38702,7 +53447,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -51152,15 +51828,16 @@
+@@ -51126,24 +55671,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -51152,15 +55709,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38724,7 +53514,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -51194,9 +51871,10 @@
+@@ -51169,8 +55727,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -51194,9 +55757,10 @@
  
    ac_header_preproc=no
  fi
@@ -38737,7 +53543,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -51220,25 +51898,19 @@
+@@ -51220,25 +55784,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -38770,7 +53576,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -51259,9 +51931,9 @@
+@@ -51259,9 +55817,9 @@
  for ac_func in getpt openpty isastream
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -38783,7 +53589,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -51287,30 +51959,24 @@
+@@ -51287,53 +55845,59 @@
  
  #undef $ac_func
  
@@ -38819,7 +53625,50 @@
    ;
    return 0;
  }
-@@ -51342,13 +52008,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -51342,13 +55906,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38838,7 +53687,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -51359,13 +52027,12 @@
+@@ -51359,13 +55925,12 @@
  
  LIBS="$kde_save_LIBS"
  
@@ -38856,7 +53705,7 @@
    yes)
      with_ldap=CHECK
      ;;
-@@ -51373,7 +52040,8 @@
+@@ -51373,7 +55938,8 @@
  else
     with_ldap=CHECK
  
@@ -38866,25 +53715,25 @@
  if test "x$with_ldap" = "xCHECK" ; then
    with_ldap=NOTFOUND
    search_incs="$kde_includes /usr/include /usr/local/include"
-@@ -51383,7 +52051,7 @@
+@@ -51383,7 +55949,7 @@
  do
    for j in ldap.h;
    do
 -    echo "configure: 51386: $i/$j" >&5
-+    echo "configure: 52054: $i/$j" >&5
++    echo "configure: 55952: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ldap_incdir=$i
-@@ -51405,7 +52073,7 @@
+@@ -51405,7 +55971,7 @@
  do
    for j in libldap.$ext;
    do
 -    echo "configure: 51408: $i/$j" >&5
-+    echo "configure: 52076: $i/$j" >&5
++    echo "configure: 55974: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ldap_libdir=$i
-@@ -51428,8 +52096,8 @@
+@@ -51428,8 +55994,8 @@
  fi
  
  case "$with_ldap" in
@@ -38895,7 +53744,7 @@
  framework)
    LDAP_LIBS="-Xlinker -framework -Xlinker LDAP"
  
-@@ -51438,18 +52106,18 @@
+@@ -51438,18 +56004,18 @@
  _ACEOF
  
    LDAP_SUBDIR="ldap"
@@ -38922,7 +53771,7 @@
    ;;
  esac
  
-@@ -51463,8 +52131,8 @@
+@@ -51463,8 +56029,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -38933,7 +53782,7 @@
  if test "${ac_cv_lib_lber_ber_alloc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -51477,17 +52145,17 @@
+@@ -51477,40 +56043,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -38955,7 +53804,50 @@
    ;
    return 0;
  }
-@@ -51519,14 +52187,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -51519,14 +56097,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38974,7 +53866,7 @@
  if test $ac_cv_lib_lber_ber_alloc = yes; then
    LIB_LBER=-llber
  fi
-@@ -51536,8 +52205,8 @@
+@@ -51536,8 +56115,8 @@
  
  
  
@@ -38985,7 +53877,7 @@
  
    if test "x$with_ldap" != "xFOUND" ; then
      LDAP_ROOT="$with_ldap"
-@@ -51557,7 +52226,6 @@
+@@ -51557,7 +56136,6 @@
    LIBS="$LIBS $all_libraries $LDAP_LIBS $KRB4_LIBS $X_EXTRA_LIBS"
    CFLAGS="$CFLAGS $all_includes $LDAP_INCS $KRB4_INCS"
  
@@ -38993,7 +53885,52 @@
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -51613,9 +52281,10 @@
+@@ -51587,24 +56165,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -51613,9 +56203,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39005,7 +53942,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
    ac_ext=c
-@@ -51631,8 +52300,8 @@
+@@ -51631,8 +56222,8 @@
      LDAP_LIBS=
      LDAP_RPATH=
      LDAP_SUBDIR=
@@ -39016,7 +53953,7 @@
    else
  
  cat >>confdefs.h <<_ACEOF
-@@ -51640,8 +52309,8 @@
+@@ -51640,8 +56231,8 @@
  _ACEOF
  
      LDAP_SUBDIR="ldap"
@@ -39027,7 +53964,7 @@
    fi
  
  
-@@ -51662,17 +52331,17 @@
+@@ -51662,17 +56253,17 @@
  ########### Check for linux/cdrom.h
  
  if test "${ac_cv_header_linux_cdrom_h+set}" = set; then
@@ -39051,7 +53988,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -51709,15 +52378,16 @@
+@@ -51683,24 +56274,36 @@
+ #include <linux/cdrom.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -51709,15 +56312,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39073,7 +54055,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -51751,9 +52421,10 @@
+@@ -51726,8 +56330,13 @@
+ /* end confdefs.h.  */
+ #include <linux/cdrom.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -51751,9 +56360,10 @@
  
    ac_header_preproc=no
  fi
@@ -39086,7 +54084,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -51777,25 +52448,18 @@
+@@ -51777,25 +56387,18 @@
  echo "$as_me: WARNING: linux/cdrom.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: linux/cdrom.h: in the future, the compiler will take precedence" >&2;}
@@ -39117,7 +54115,7 @@
  
  fi
  if test $ac_cv_header_linux_cdrom_h = yes; then
-@@ -51814,19 +52478,19 @@
+@@ -51814,19 +56417,19 @@
  
  
  
@@ -39143,25 +54141,25 @@
  
    hal_inc=NOTFOUND
    hal_lib=NOTFOUND
-@@ -51839,7 +52503,7 @@
+@@ -51839,7 +56442,7 @@
  do
    for j in libhal.h libhal-storage.h;
    do
 -    echo "configure: 51842: $i/$j" >&5
-+    echo "configure: 52506: $i/$j" >&5
++    echo "configure: 56445: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        hal_incdir=$i
-@@ -51874,7 +52538,7 @@
+@@ -51874,7 +56477,7 @@
  do
    for j in libhal.so libhal-storage.so;
    do
 -    echo "configure: 51877: $i/$j" >&5
-+    echo "configure: 52541: $i/$j" >&5
++    echo "configure: 56480: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        hal_libdir=$i
-@@ -51903,8 +52567,8 @@
+@@ -51903,8 +56506,8 @@
    if test -z "$PKG_CONFIG"; then
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -39172,7 +54170,7 @@
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -51919,28 +52583,29 @@
+@@ -51919,28 +56522,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -39208,7 +54206,7 @@
    fi
  
    if test "$PKG_CONFIG" = "no" ; then
-@@ -51951,25 +52616,25 @@
+@@ -51951,25 +56555,25 @@
    else
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -39246,7 +54244,7 @@
          else
              HAL_CFLAGS=""
              HAL_LIBS=""
-@@ -51990,20 +52655,20 @@
+@@ -51990,20 +56594,20 @@
    if test $succeeded = yes; then
        HAL_INCS=$HAL_CFLAGS; hal_inc=FOUND; hal_lib=FOUND;
    else
@@ -39273,7 +54271,7 @@
    fi
  
  
-@@ -52013,8 +52678,8 @@
+@@ -52013,8 +56617,8 @@
  
  ########### Check for DBus
  
@@ -39284,34 +54282,34 @@
  
    dbus_inc=NOTFOUND
    dbus_lib=NOTFOUND
-@@ -52027,7 +52692,7 @@
+@@ -52027,7 +56631,7 @@
  do
    for j in dbus/dbus.h;
    do
 -    echo "configure: 52030: $i/$j" >&5
-+    echo "configure: 52695: $i/$j" >&5
++    echo "configure: 56634: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_incdir=$i
-@@ -52044,7 +52709,7 @@
+@@ -52044,7 +56648,7 @@
  do
    for j in dbus/dbus-arch-deps.h;
    do
 -    echo "configure: 52047: $i/$j" >&5
-+    echo "configure: 52712: $i/$j" >&5
++    echo "configure: 56651: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_incdir_arch_deps=$i
-@@ -52066,7 +52731,7 @@
+@@ -52066,7 +56670,7 @@
  do
    for j in libdbus-1.so;
    do
 -    echo "configure: 52069: $i/$j" >&5
-+    echo "configure: 52734: $i/$j" >&5
++    echo "configure: 56673: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_libdir=$i
-@@ -52095,8 +52760,8 @@
+@@ -52095,8 +56699,8 @@
    if test -z "$PKG_CONFIG"; then
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -39322,7 +54320,7 @@
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -52111,28 +52776,29 @@
+@@ -52111,28 +56715,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -39358,7 +54356,7 @@
    fi
  
    if test "$PKG_CONFIG" = "no" ; then
-@@ -52143,25 +52809,25 @@
+@@ -52143,25 +56748,25 @@
    else
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
@@ -39396,7 +54394,7 @@
          else
              DBUS_CFLAGS=""
              DBUS_LIBS=""
-@@ -52182,19 +52848,19 @@
+@@ -52182,19 +56787,19 @@
    if test $succeeded = yes; then
        DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND;
    else
@@ -39422,7 +54420,7 @@
    fi
  
  
-@@ -52202,8 +52868,8 @@
+@@ -52202,8 +56807,8 @@
  
  ########### Check for DBus-Qt bindings
  
@@ -39433,43 +54431,43 @@
  
    dbusqt_inc=NOTFOUND
    dbusqt_lib=NOTFOUND
-@@ -52216,7 +52882,7 @@
+@@ -52216,7 +56821,7 @@
  do
    for j in dbus/connection.h;
    do
 -    echo "configure: 52219: $i/$j" >&5
-+    echo "configure: 52885: $i/$j" >&5
++    echo "configure: 56824: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_incdir=$i
-@@ -52243,7 +52909,7 @@
+@@ -52243,7 +56848,7 @@
  do
    for j in libdbus-qt-1.so;
    do
 -    echo "configure: 52246: $i/$j" >&5
-+    echo "configure: 52912: $i/$j" >&5
++    echo "configure: 56851: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_libdir=$i
-@@ -52267,7 +52933,7 @@
+@@ -52267,7 +56872,7 @@
  do
    for j in dbus/connection.h;
    do
 -    echo "configure: 52270: $i/$j" >&5
-+    echo "configure: 52936: $i/$j" >&5
++    echo "configure: 56875: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_incdir=$i
-@@ -52293,7 +52959,7 @@
+@@ -52293,7 +56898,7 @@
  do
    for j in libdbus-qt-1.so;
    do
 -    echo "configure: 52296: $i/$j" >&5
-+    echo "configure: 52962: $i/$j" >&5
++    echo "configure: 56901: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_libdir=$i
-@@ -52312,12 +52978,12 @@
+@@ -52312,12 +56917,12 @@
  
  
    if test $dbusqt_inc = FOUND && test $dbusqt_lib = FOUND ; then
@@ -39486,7 +54484,7 @@
    fi
  
  
-@@ -52326,8 +52992,8 @@
+@@ -52326,8 +56931,8 @@
  
  ########### Check if media HAL backend sould be compiled
  
@@ -39497,7 +54495,7 @@
  
  HALBACKEND=no
  if test "x$hal" = "xFOUND" && test "x$dbus" = "xFOUND" && test "x$dbusqt" = "xFOUND" ; then
-@@ -52338,11 +53004,11 @@
+@@ -52338,11 +56943,11 @@
  
    HALBACKEND=yes
  
@@ -39513,7 +54511,7 @@
  fi
  
  
-@@ -52369,15 +53035,15 @@
+@@ -52369,15 +56974,15 @@
  
  
  
@@ -39534,7 +54532,7 @@
  if test "${ac_cv_sys_largefile_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -52385,8 +53051,8 @@
+@@ -52385,8 +56990,8 @@
       if test "$GCC" != yes; then
         ac_save_CC=$CC
         while :; do
@@ -39545,16 +54543,54 @@
  	 cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -52410,7 +53076,7 @@
+@@ -52410,25 +57015,37 @@
    return 0;
  }
  _ACEOF
 -     	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +	 rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
-@@ -52437,10 +53103,12 @@
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -52437,28 +57054,42 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39564,12 +54600,50 @@
  rm -f conftest.err conftest.$ac_objext
 -     	 CC="$CC -n32"
 -     	 rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +	 CC="$CC -n32"
 +	 rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
-@@ -52467,7 +53135,9 @@
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -52467,7 +57098,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39579,7 +54653,7 @@
  rm -f conftest.err conftest.$ac_objext
  	 break
         done
-@@ -52475,14 +53145,14 @@
+@@ -52475,14 +57108,14 @@
         rm -f conftest.$ac_ext
      fi
  fi
@@ -39598,7 +54672,52 @@
  if test "${ac_cv_sys_file_offset_bits+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -52538,7 +53208,9 @@
+@@ -52512,24 +57145,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -52538,7 +57183,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39608,7 +54727,52 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -52591,13 +53263,15 @@
+@@ -52565,24 +57212,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -52591,13 +57250,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39626,7 +54790,7 @@
  if test "$ac_cv_sys_file_offset_bits" != no; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -52606,8 +53280,8 @@
+@@ -52606,8 +57267,8 @@
  
  fi
  rm -f conftest*
@@ -39637,7 +54801,52 @@
  if test "${ac_cv_sys_large_files+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -52663,7 +53337,9 @@
+@@ -52637,24 +57298,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -52663,7 +57336,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39647,7 +54856,52 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -52716,13 +53392,15 @@
+@@ -52690,24 +57365,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -52716,13 +57403,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39665,7 +54919,7 @@
  if test "$ac_cv_sys_large_files" != no; then
  
  cat >>confdefs.h <<_ACEOF
-@@ -52746,13 +53424,13 @@
+@@ -52746,13 +57435,13 @@
  
  
  
@@ -39683,7 +54937,7 @@
  
  have_libsmbclient=no
  if test "x$with_samba" != xno; then
-@@ -52761,8 +53439,7 @@
+@@ -52761,8 +57450,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -39693,7 +54947,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -52772,17 +53449,17 @@
+@@ -52772,17 +57460,17 @@
  
  
     if test "${ac_cv_header_libsmbclient_h+set}" = set; then
@@ -39717,7 +54971,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -52819,15 +53496,16 @@
+@@ -52793,24 +57481,36 @@
+ #include <libsmbclient.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -52819,15 +57519,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39739,7 +55038,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -52861,9 +53539,10 @@
+@@ -52836,8 +57537,13 @@
+ /* end confdefs.h.  */
+ #include <libsmbclient.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -52861,9 +57567,10 @@
  
    ac_header_preproc=no
  fi
@@ -39752,7 +55067,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -52887,25 +53566,18 @@
+@@ -52887,25 +57594,18 @@
  echo "$as_me: WARNING: libsmbclient.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: libsmbclient.h: in the future, the compiler will take precedence" >&2;}
@@ -39783,7 +55098,7 @@
  
  fi
  if test $ac_cv_header_libsmbclient_h = yes; then
-@@ -52933,8 +53605,8 @@
+@@ -52933,8 +57633,8 @@
  	;;
       esac
  
@@ -39794,7 +55109,7 @@
  if test "${ac_cv_lib_smbclient_smbc_new_context+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -52947,17 +53619,17 @@
+@@ -52947,40 +57647,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39816,7 +55131,50 @@
    ;
    return 0;
  }
-@@ -52989,14 +53661,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -52989,14 +57701,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39835,7 +55193,7 @@
  if test $ac_cv_lib_smbclient_smbc_new_context = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBSMBCLIENT 1
-@@ -53013,8 +53686,8 @@
+@@ -53013,8 +57726,8 @@
  
  
    SMBCLIENT_EXTRA_LIBS=""
@@ -39846,7 +55204,7 @@
  if test "${ac_cv_func_yp_get_default_domain+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -53041,30 +53714,24 @@
+@@ -53041,53 +57754,59 @@
  
  #undef yp_get_default_domain
  
@@ -39882,7 +55240,50 @@
    ;
    return 0;
  }
-@@ -53096,13 +53763,14 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53096,13 +57815,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39900,7 +55301,7 @@
  if test $ac_cv_func_yp_get_default_domain = yes; then
    :
  else
-@@ -53116,8 +53784,8 @@
+@@ -53116,8 +57836,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -39911,7 +55312,7 @@
  if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -53130,17 +53798,17 @@
+@@ -53130,40 +57850,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39933,7 +55334,50 @@
    ;
    return 0;
  }
-@@ -53172,14 +53840,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53172,14 +57904,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39952,7 +55396,7 @@
  if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
    SMBCLIENT_EXTRA_LIBS="-lnsl"
  fi
-@@ -53216,13 +53885,13 @@
+@@ -53216,13 +57949,13 @@
  
  
  
@@ -39970,7 +55414,7 @@
  
  if test "x$with_openexr" != xno; then
  
-@@ -53235,8 +53904,8 @@
+@@ -53235,8 +57968,8 @@
    if test -z "$PKG_CONFIG"; then
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -39981,7 +55425,7 @@
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -53251,56 +53920,56 @@
+@@ -53251,56 +57984,56 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -40054,7 +55498,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -53361,9 +54030,10 @@
+@@ -53335,24 +58068,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53361,9 +58106,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40066,7 +55555,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
             LIBS="$kde_save_LIBS"
-@@ -53383,11 +54053,11 @@
+@@ -53383,11 +58129,11 @@
  _ACEOF
  
                 LIB_EXR="$ac_cv_libexr"
@@ -40082,7 +55571,7 @@
                 LIB_EXR=""
             fi
          fi
-@@ -53419,8 +54089,7 @@
+@@ -53419,8 +58165,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -40092,7 +55581,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -53429,8 +54098,8 @@
+@@ -53429,8 +58174,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -40103,7 +55592,52 @@
  if test "${ac_cv_header_X11_extensions_Xfixes_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -53471,12 +54140,13 @@
+@@ -53445,24 +58190,36 @@
+ #include <X11/extensions/Xfixes.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53471,12 +58228,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40120,7 +55654,7 @@
  if test $ac_cv_header_X11_extensions_Xfixes_h = yes; then
    xfixes_h=yes
  else
-@@ -53502,8 +54172,8 @@
+@@ -53502,8 +58260,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -40131,7 +55665,7 @@
  if test "${ac_cv_lib_Xfixes_XFixesQueryExtension+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -53516,17 +54186,17 @@
+@@ -53516,40 +58274,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -40153,7 +55687,50 @@
    ;
    return 0;
  }
-@@ -53558,14 +54228,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53558,14 +58328,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40172,7 +55749,7 @@
  if test $ac_cv_lib_Xfixes_XFixesQueryExtension = yes; then
    LIB_XFIXES=-lXfixes
  
-@@ -53593,15 +54264,14 @@
+@@ -53593,15 +58364,14 @@
  
  kde_mallinfo_type=
  
@@ -40191,7 +55768,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -53660,8 +54330,9 @@
+@@ -53634,24 +58404,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53660,8 +58442,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40202,7 +55824,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
      ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -53675,20 +54346,19 @@
+@@ -53675,20 +58458,19 @@
  if test "$kde_cv_func_mallinfo_stdlib" = "yes"; then
      kde_mallinfo_type=stdlib
  fi
@@ -40228,7 +55850,52 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -53747,8 +54417,9 @@
+@@ -53721,24 +58503,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53747,8 +58541,9 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40239,7 +55906,7 @@
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
      ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -53762,8 +54433,8 @@
+@@ -53762,8 +58557,8 @@
  if test "$kde_cv_func_mallinfo_malloc" = "yes"; then
      kde_mallinfo_type=malloc
  fi
@@ -40250,7 +55917,7 @@
  
  fi
  
-@@ -53774,17 +54445,17 @@
+@@ -53774,40 +58569,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -40272,7 +55939,50 @@
    ;
    return 0;
  }
-@@ -53816,8 +54487,8 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53816,8 +58623,8 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40283,7 +55993,7 @@
  if test "${ac_cv_lib_malloc_mallinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -53830,17 +54501,17 @@
+@@ -53830,40 +58637,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -40305,7 +56015,50 @@
    ;
    return 0;
  }
-@@ -53872,14 +54543,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -53872,14 +58691,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40324,7 +56077,7 @@
  if test $ac_cv_lib_malloc_mallinfo = yes; then
     LIBMALLOC="-lmalloc"
  
-@@ -53889,20 +54561,20 @@
+@@ -53889,20 +58709,20 @@
  
  
  fi
@@ -40349,7 +56102,34 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -54005,8 +54677,10 @@
+@@ -53986,13 +58806,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -54005,8 +58834,10 @@
  ( exit $ac_status )
  kde_cv_func_mallinfo_field_hblkhd=no
  fi
@@ -40361,7 +56141,7 @@
      ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -54016,8 +54690,8 @@
+@@ -54016,8 +58847,8 @@
  
  fi
  
@@ -40372,7 +56152,7 @@
  kde_mallinfo_hblkhd=$kde_cv_func_mallinfo_field_hblkhd
  if test "$kde_mallinfo_hblkhd" = "yes"; then
  
-@@ -54028,15 +54702,14 @@
+@@ -54028,15 +58859,14 @@
  fi
  
  
@@ -40391,7 +56171,34 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -54139,8 +54812,10 @@
+@@ -54120,13 +58950,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -54139,8 +58978,10 @@
  ( exit $ac_status )
  kde_cv_func_mallinfo_field_uordblks=no
  fi
@@ -40403,7 +56210,7 @@
      ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -54150,8 +54825,8 @@
+@@ -54150,8 +58991,8 @@
  
  fi
  
@@ -40414,7 +56221,7 @@
  kde_mallinfo_uordblks=$kde_cv_func_mallinfo_field_uordblks
  if test "$kde_mallinfo_uordblks" = "yes"; then
  
-@@ -54162,15 +54837,14 @@
+@@ -54162,15 +59003,14 @@
  fi
  
  
@@ -40433,7 +56240,34 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -54273,8 +54947,10 @@
+@@ -54254,13 +59094,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -54273,8 +59122,10 @@
  ( exit $ac_status )
  kde_cv_func_mallinfo_field_usmblks=no
  fi
@@ -40445,7 +56279,7 @@
      ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -54284,8 +54960,8 @@
+@@ -54284,8 +59135,8 @@
  
  fi
  
@@ -40456,7 +56290,7 @@
  kde_mallinfo_usmblks=$kde_cv_func_mallinfo_field_usmblks
  if test "$kde_mallinfo_usmblks" = "yes"; then
  
-@@ -54317,14 +54993,14 @@
+@@ -54317,14 +59168,14 @@
  
  fi
  
@@ -40477,7 +56311,34 @@
  if test "$ac_use_openpty" = "yes"; then
  	kde_safe_LIBS=$LIBS
  	LIBS="$LIBS $LIBUTIL"
-@@ -54374,8 +55050,10 @@
+@@ -54355,13 +59206,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -54374,8 +59234,10 @@
  ( exit $ac_status )
  ac_use_openpty="no"
  fi
@@ -40489,7 +56350,7 @@
  	LIBS=$kde_safe_LIBS
  fi
  if test "$ac_use_openpty" = "yes"; then
-@@ -54384,21 +55062,21 @@
+@@ -54384,21 +59246,21 @@
  #define HAVE_OPENPTY 1
  _ACEOF
  
@@ -40519,7 +56380,7 @@
  
  case "$cwd_method" in
  	proc)
-@@ -54414,9 +55092,9 @@
+@@ -54414,9 +59276,9 @@
  for ac_func in _IceTransNoListen
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -40532,7 +56393,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -54442,30 +55120,24 @@
+@@ -54442,53 +59304,59 @@
  
  #undef $ac_func
  
@@ -40568,7 +56429,50 @@
    ;
    return 0;
  }
-@@ -54497,13 +55169,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -54497,13 +59365,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40587,7 +56491,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -54517,11 +55191,11 @@
+@@ -54517,11 +59387,11 @@
  LIB_XINERAMA=
  
  
@@ -40602,7 +56506,7 @@
  
  if test "x$with_xinerama" != "xno"; then
    xinerama_save_ldflags="$LDFLAGS"
-@@ -54531,8 +55205,7 @@
+@@ -54531,8 +59401,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -40612,7 +56516,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -54541,8 +55214,8 @@
+@@ -54541,8 +59410,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -40623,7 +56527,52 @@
  if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -54585,16 +55258,17 @@
+@@ -54559,24 +59428,36 @@
+ #include <X11/extensions/Xinerama.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -54585,16 +59466,17 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40646,7 +56595,7 @@
  if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -54607,17 +55281,17 @@
+@@ -54607,40 +59489,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -40668,7 +56617,50 @@
    ;
    return 0;
  }
-@@ -54649,14 +55323,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -54649,14 +59543,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40687,7 +56679,7 @@
  if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then
  
  
-@@ -54686,8 +55361,8 @@
+@@ -54686,8 +59581,8 @@
  fi
  
  
@@ -40698,7 +56690,7 @@
  case "$host" in
    *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
    *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
-@@ -54699,8 +55374,8 @@
+@@ -54699,8 +59594,8 @@
    *) ksysguardd_compile=no; UNAME='' ;;
  esac
  
@@ -40709,7 +56701,7 @@
  
  
  
-@@ -54785,23 +55460,22 @@
+@@ -54785,23 +59680,22 @@
  
  
  
@@ -40738,7 +56730,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -54814,18 +55488,19 @@
+@@ -54814,18 +59708,19 @@
  for ac_header in sensors/sensors.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40766,7 +56758,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -54862,15 +55537,16 @@
+@@ -54836,24 +59731,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -54862,15 +59769,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40788,7 +56825,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -54904,9 +55580,10 @@
+@@ -54879,8 +59787,13 @@
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -54904,9 +59817,10 @@
  
    ac_header_preproc=no
  fi
@@ -40801,7 +56854,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -54930,25 +55607,19 @@
+@@ -54930,25 +59844,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -40834,7 +56887,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -54977,8 +55648,8 @@
+@@ -54977,8 +59885,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -40845,7 +56898,7 @@
  if test "${ac_cv_lib_sensors_sensors_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -54991,17 +55662,17 @@
+@@ -54991,40 +59899,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -40867,7 +56920,50 @@
    ;
    return 0;
  }
-@@ -55033,14 +55704,15 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -55033,14 +59953,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40886,7 +56982,7 @@
  if test $ac_cv_lib_sensors_sensors_init = yes; then
    LIBSENSORS="-lsensors"
  fi
-@@ -55077,16 +55749,16 @@
+@@ -55077,16 +59998,16 @@
  
  #MIN_CONFIG
  
@@ -40909,7 +57005,52 @@
  save_dnssdtest_LIBS="$LIBS"
  save_dnssdtest_LDFLAGS="$LDFLAGS"
  save_dnssdtest_CPPFLAGS="$CPPFLAGS"
-@@ -55150,19 +55822,20 @@
+@@ -55118,24 +60039,36 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -55150,19 +60083,20 @@
  				*) LIB_DNSSD="-ldns_sd" ;;
  			esac
  			have_libdns_sd="yes"
@@ -40934,7 +57075,7 @@
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  CPPFLAGS=$save_dnssdtest_CPPFLAGS
-@@ -55186,10 +55859,9 @@
+@@ -55186,10 +60120,9 @@
  
  
  
@@ -40946,7 +57087,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55202,9 +55874,9 @@
+@@ -55202,9 +60135,9 @@
  for ac_header in X11/extensions/Xdamage.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40959,7 +57100,52 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -55244,12 +55916,14 @@
+@@ -55218,24 +60151,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -55244,12 +60189,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40977,7 +57163,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -55273,10 +55947,9 @@
+@@ -55273,10 +60220,9 @@
  
  
  
@@ -40989,7 +57175,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55289,9 +55962,9 @@
+@@ -55289,9 +60235,9 @@
  for ac_header in X11/extensions/Xcomposite.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -41002,7 +57188,52 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -55331,12 +56004,14 @@
+@@ -55305,24 +60251,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -55331,12 +60289,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -41020,7 +57251,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -55360,10 +56035,9 @@
+@@ -55360,10 +60320,9 @@
  
  
  
@@ -41032,7 +57263,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55376,9 +56050,9 @@
+@@ -55376,9 +60335,9 @@
  for ac_header in X11/extensions/Xrender.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -41045,7 +57276,52 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -55418,12 +56092,14 @@
+@@ -55392,24 +60351,36 @@
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -55418,12 +60389,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -41063,7 +57339,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -55462,8 +56138,7 @@
+@@ -55462,8 +60435,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -41073,7 +57349,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55473,17 +56148,17 @@
+@@ -55473,17 +60445,17 @@
  
  
     if test "${ac_cv_header_X11_Xlib_h+set}" = set; then
@@ -41097,7 +57373,52 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -55520,15 +56195,16 @@
+@@ -55494,24 +60466,36 @@
+ #include <X11/Xlib.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -55520,15 +60504,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -41119,7 +57440,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -55562,9 +56238,10 @@
+@@ -55537,8 +60522,13 @@
+ /* end confdefs.h.  */
+ #include <X11/Xlib.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -55562,9 +60552,10 @@
  
    ac_header_preproc=no
  fi
@@ -41132,7 +57469,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -55588,25 +56265,18 @@
+@@ -55588,25 +60579,18 @@
  echo "$as_me: WARNING: X11/Xlib.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: X11/Xlib.h: in the future, the compiler will take precedence" >&2;}
@@ -41163,7 +57500,7 @@
  
  fi
  
-@@ -55623,8 +56293,7 @@
+@@ -55623,8 +60607,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -41173,7 +57510,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55633,8 +56302,8 @@
+@@ -55633,8 +60616,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -41184,7 +57521,52 @@
  if test "${ac_cv_header_X11_extensions_XKBstr_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -55677,12 +56346,13 @@
+@@ -55651,24 +60634,36 @@
+ #include <X11/extensions/XKBstr.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -55677,12 +60672,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -41201,7 +57583,7 @@
  if test $ac_cv_header_X11_extensions_XKBstr_h = yes; then
    :
  else
-@@ -55702,8 +56372,7 @@
+@@ -55702,8 +60698,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -41211,7 +57593,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -55712,8 +56381,8 @@
+@@ -55712,8 +60707,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -41222,7 +57604,52 @@
  if test "${ac_cv_header_X11_extensions_XKBrules_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -55758,12 +56427,13 @@
+@@ -55732,24 +60727,36 @@
+ #include <X11/extensions/XKBrules.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+@@ -55758,12 +60765,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -41239,7 +57666,7 @@
  if test $ac_cv_header_X11_extensions_XKBrules_h = yes; then
    :
  else
-@@ -55800,8 +56470,8 @@
+@@ -55800,8 +60808,8 @@
  fi
  
  for i in $ac_topsubdirs; do
@@ -41250,7 +57677,7 @@
    if test -d $srcdir/$i; then
      install_it="yes"
      for j in $DO_NOT_COMPILE; do
-@@ -55812,8 +56482,8 @@
+@@ -55812,8 +60820,8 @@
    else
      install_it="no"
    fi
@@ -41261,7 +57688,7 @@
    vari=`echo $i | sed -e 's,[-+.@],_,g'`
    if test $install_it = "yes"; then
      TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -57265,39 +57935,58 @@
+@@ -57265,39 +62273,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -41336,7 +57763,7 @@
    fi
  fi
  rm -f confcache
-@@ -57306,38 +57995,31 @@
+@@ -57306,38 +62333,31 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -41388,7 +57815,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
-@@ -57922,11 +58604,35 @@
+@@ -57922,11 +62942,35 @@
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -41426,7 +57853,7 @@
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
-@@ -57935,8 +58641,43 @@
+@@ -57935,8 +62979,43 @@
  fi
  
  
@@ -41471,7 +57898,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -57950,18 +58691,19 @@
+@@ -57950,18 +63029,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -41494,7 +57921,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -57969,159 +58711,120 @@
+@@ -57969,159 +63049,120 @@
  
  
  # Name of the executable.
@@ -41666,7 +58093,7 @@
 -' ECHO_T='	' ;;
 -  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
 -  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (dirname -- /) >/dev/null 2>&1; then
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 +  as_dirname=dirname
 +else
 +  as_dirname=false
@@ -41725,7 +58152,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -58130,7 +58833,19 @@
+@@ -58130,7 +63171,19 @@
    as_mkdir_p=false
  fi
  
@@ -41746,7 +58173,7 @@
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -58139,31 +58854,14 @@
+@@ -58139,31 +63192,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -41778,11 +58205,11 @@
 +ac_log="
  This file was extended by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.59d.  Invocation command line was
++generated by GNU Autoconf 2.59e.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -58171,30 +58869,20 @@
+@@ -58171,30 +63207,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -41821,7 +58248,7 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -58221,19 +58909,21 @@
+@@ -58221,19 +63247,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -41832,8 +58259,9 @@
  ac_cs_version="\\
  config.status
 -configured by $0, generated by GNU Autoconf 2.59,
-+configured by $0, generated by GNU Autoconf 2.59d,
-   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.59e,
++  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 2006 Free Software Foundation, Inc.
@@ -41848,7 +58276,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -58244,39 +58934,24 @@
+@@ -58244,39 +63272,24 @@
  do
    case $1 in
    --*=*)
@@ -41894,7 +58322,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -58286,18 +58961,24 @@
+@@ -58286,18 +63299,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -41924,16 +58352,16 @@
  
    esac
    shift
-@@ -58313,527 +58994,539 @@
+@@ -58313,527 +63332,539 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
 -  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
 -  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  echo "running CONFIG_SHELL=$SHELL $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
 +  CONFIG_SHELL=$SHELL
 +  export CONFIG_SHELL
-+  exec $SHELL "$0" $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  fi
  
  _ACEOF
@@ -42965,7 +59393,7 @@
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -58845,740 +59538,1014 @@
+@@ -58845,740 +63876,1013 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -43653,7 +60081,7 @@
 +ac_ct_CXX!$ac_ct_CXX$ac_delim
 +_ACEOF
 +
-+  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -43665,10 +60093,10 @@
 -fi # test -n "$CONFIG_FILES"
 +done
 +
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+  ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
 +fi
 +
 +cat >>$CONFIG_STATUS <<_ACEOF
@@ -43792,7 +60220,7 @@
 +KCFG_DEPENDENCIES!$KCFG_DEPENDENCIES$ac_delim
 +_ACEOF
 +
-+  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -43803,10 +60231,10 @@
 +  fi
 +done
 +
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+  ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
 +fi
 +
 +cat >>$CONFIG_STATUS <<_ACEOF
@@ -43896,7 +60324,6 @@
 +LIBCFG!$LIBCFG$ac_delim
 +LIBODM!$LIBODM$ac_delim
 +LIBCURSES!$LIBCURSES$ac_delim
-+LIBUTEMPTER!$LIBUTEMPTER$ac_delim
 +LIBKSTAT!$LIBKSTAT$ac_delim
 +LIBDEVINFO!$LIBDEVINFO$ac_delim
 +JAVAC!$JAVAC$ac_delim
@@ -43928,9 +60355,10 @@
 +SSL_INCLUDES!$SSL_INCLUDES$ac_delim
 +SSL_LDFLAGS!$SSL_LDFLAGS$ac_delim
 +LIBSSL!$LIBSSL$ac_delim
++DPMSINC!$DPMSINC$ac_delim
 +_ACEOF
 +
-+  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -43941,10 +60369,10 @@
 +  fi
 +done
 +
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+  ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
 +fi
 +
 +cat >>$CONFIG_STATUS <<_ACEOF
@@ -43969,7 +60397,6 @@
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  cat >conf$$subs.sed <<_ACEOF
-+DPMSINC!$DPMSINC$ac_delim
 +DPMSLIB!$DPMSLIB$ac_delim
 +LIBFONTCONFIG_LIBS!$LIBFONTCONFIG_LIBS$ac_delim
 +LIBFONTCONFIG_CFLAGS!$LIBFONTCONFIG_CFLAGS$ac_delim
@@ -44066,9 +60493,10 @@
 +include_ksysguardd_netbsd_TRUE!$include_ksysguardd_netbsd_TRUE$ac_delim
 +include_ksysguardd_netbsd_FALSE!$include_ksysguardd_netbsd_FALSE$ac_delim
 +include_ksysguardd_solaris_TRUE!$include_ksysguardd_solaris_TRUE$ac_delim
++include_ksysguardd_solaris_FALSE!$include_ksysguardd_solaris_FALSE$ac_delim
 +_ACEOF
 +
-+  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -44079,10 +60507,10 @@
 +  fi
 +done
 +
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+  ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
 +fi
 +
 +cat >>$CONFIG_STATUS <<_ACEOF
@@ -44107,7 +60535,6 @@
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  cat >conf$$subs.sed <<_ACEOF
-+include_ksysguardd_solaris_FALSE!$include_ksysguardd_solaris_FALSE$ac_delim
 +include_ksysguardd_tru64_TRUE!$include_ksysguardd_tru64_TRUE$ac_delim
 +include_ksysguardd_tru64_FALSE!$include_ksysguardd_tru64_FALSE$ac_delim
 +include_ksysguardd_irix_TRUE!$include_ksysguardd_irix_TRUE$ac_delim
@@ -44204,9 +60631,10 @@
 +konqueror_SUBDIR_included_FALSE!$konqueror_SUBDIR_included_FALSE$ac_delim
 +ksmserver_SUBDIR_included_TRUE!$ksmserver_SUBDIR_included_TRUE$ac_delim
 +ksmserver_SUBDIR_included_FALSE!$ksmserver_SUBDIR_included_FALSE$ac_delim
++kicker_SUBDIR_included_TRUE!$kicker_SUBDIR_included_TRUE$ac_delim
 +_ACEOF
 +
-+  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 97; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -44217,10 +60645,10 @@
 +  fi
 +done
 +
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+  ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
 +fi
 +
 +cat >>$CONFIG_STATUS <<_ACEOF
@@ -44245,7 +60673,6 @@
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  cat >conf$$subs.sed <<_ACEOF
-+kicker_SUBDIR_included_TRUE!$kicker_SUBDIR_included_TRUE$ac_delim
 +kicker_SUBDIR_included_FALSE!$kicker_SUBDIR_included_FALSE$ac_delim
 +kcontrol_SUBDIR_included_TRUE!$kcontrol_SUBDIR_included_TRUE$ac_delim
 +kcontrol_SUBDIR_included_FALSE!$kcontrol_SUBDIR_included_FALSE$ac_delim
@@ -44257,7 +60684,7 @@
 +LTLIBOBJS!$LTLIBOBJS$ac_delim
 +_ACEOF
 +
-+  if test `grep -c "$ac_delim\$" conf$$subs.sed` = 10; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -44268,10 +60695,10 @@
 +  fi
 +done
  
-+ac_eof=
-+if grep '^CEOF$' conf$$subs.sed >/dev/null; then
-+  ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
-+  ac_eof=`expr 0$ac_eof + 1`
++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
++if test -n "$ac_eof"; then
++  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
++  ac_eof=`expr $ac_eof + 1`
 +fi
 +
 +cat >>$CONFIG_STATUS <<_ACEOF
@@ -44625,7 +61052,7 @@
 +cat >>$CONFIG_STATUS <<\_ACEOF
 +# If the template does not know about datarootdir, expand it.
 +# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=
++ac_datarootdir_hack=; ac_datarootdir_seen=
 +
 +case `sed -n '/datarootdir/ {
 +  p
@@ -44637,7 +61064,7 @@
 +/@localedir@/p
 +/@mandir@/p
 +' $ac_file_inputs` in
-+*datarootdir*) ;;
++*datarootdir*) ac_datarootdir_seen=yes;;
 +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
 +  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
@@ -44659,7 +61086,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -59586,248 +60553,122 @@
+@@ -59586,248 +64890,129 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -44715,6 +61142,13 @@
 +s&@INSTALL@&$ac_INSTALL&;t t
 +$ac_datarootdir_hack
 +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" | sed -f "$tmp/subs-6.sed" >$tmp/out
++
++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
++  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined.  Please make sure it is defined." >&5
++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined.  Please make sure it is defined." >&2;}
  
 -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
 -  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
@@ -45001,7 +61435,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -59838,135 +60679,39 @@
+@@ -59838,135 +65023,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -45163,7 +61597,7 @@
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -59976,18 +60721,29 @@
+@@ -59976,18 +65065,29 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -45201,7 +61635,7 @@
    else
      continue
    fi
-@@ -60009,53 +60765,79 @@
+@@ -60009,53 +65109,79 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -45321,6 +61755,58 @@
  KDE_SET_PREFIX
  
  dnl generate the config header
+@@ -122,13 +124,6 @@
+   AC_DEFINE_UNQUOTED(HAVE_SETUPTERM, 1, [Define if you have setupterm in -l(n)curses])
+ fi
+ 
+-kde_have_utempter=yes
+-AC_CHECK_LIB(utempter, addToUtmp, [LIBUTEMPTER=-lutempter], kde_have_utempter=no)
+-AC_SUBST(LIBUTEMPTER)
+-if test "$kde_have_utempter" = "yes"; then
+-  AC_DEFINE_UNQUOTED(HAVE_UTEMPTER, 1, [Define if you have the utempter helper for utmp managment])
+-fi
+-
+ AC_CHECK_FUNC(res_init, ,
+   AC_CHECK_LIB(resolv, res_init, [LIBRESOLV="-lresolv"], , $LIBSOCKET)) dnl for Sun
+ 
+@@ -1188,37 +1183,6 @@
+ 
+ 
+ dnl ---------------------------------------------------------------------------
+-dnl check if compiler can compile something like this :
+-dnl class A { public: void foo( int ); };
+-dnl class B : public A { public: using A::foo; void foo( char ); }
+-dnl gcc 2.95.x fails with an error message
+-dnl ---------------------------------------------------------------------------
+-
+-AC_MSG_CHECKING(for working using)
+-AC_CACHE_VAL(kde_cv_working_using,
+-    [
+-    kde_cv_working_using=no
+-    AC_LANG_SAVE
+-    AC_LANG_CPLUSPLUS
+-    AC_TRY_COMPILE( 
+-        [],[
+-        class A { public: void foo( int ); };
+-        class B : public A { public: using A::foo; void foo( char ); };
+-        ],
+-        [ kde_cv_working_using=yes ])
+-    AC_LANG_RESTORE
+-    ])
+-
+-if test "$kde_cv_working_using" = "yes"; then
+-    AC_MSG_RESULT(yes)
+-    AC_DEFINE(HAVE_WORKING_USING, 1,
+-        [Define if the using keyword works correctly])
+-else
+-    AC_MSG_RESULT(no)
+-fi
+-
+-
+-dnl ---------------------------------------------------------------------------
+ dnl check for arts for speech recognition
+ dnl ---------------------------------------------------------------------------
+ 
 --- doc/faq/Makefile.in
 +++ doc/faq/Makefile.in
 @@ -107,6 +107,7 @@
@@ -45331,7 +61817,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45341,7 +61835,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45349,7 +61843,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -45362,7 +61856,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -45376,7 +61870,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -45384,7 +61878,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -45392,7 +61886,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -45405,7 +61899,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45414,7 +61908,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45426,32 +61920,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +738,10 @@
+@@ -729,10 +737,10 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=desktop.docbook about.docbook winmng.docbook qt.docbook tips.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook configkde.docbook install.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2 
-+KDE_DIST=desktop.docbook about.docbook winmng.docbook tips.docbook qt.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook configkde.docbook install.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2 
++KDE_DIST=desktop.docbook about.docbook winmng.docbook tips.docbook qt.docbook nonkdeapps.docbook intro.docbook getkde.docbook index.docbook sound.docbook kdeapps.docbook misc.docbook moreinfo.docbook install.docbook configkde.docbook Makefile.in contrib.docbook questions.docbook webbrowse.docbook notrelated.docbook panel.docbook filemng.docbook Makefile.am index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdeapps.docbook desktop.docbook getkde.docbook moreinfo.docbook intro.docbook index.docbook misc.docbook install.docbook notrelated.docbook TODO about.docbook panel.docbook questions.docbook contrib.docbook configkde.docbook nonkdeapps.docbook winmng.docbook qt.docbook filemng.docbook sound.docbook webbrowse.docbook tips.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
+@@ -759,20 +767,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
 -	@for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
-+	@for base in kdeapps.docbook desktop.docbook getkde.docbook moreinfo.docbook intro.docbook index.docbook misc.docbook install.docbook notrelated.docbook TODO about.docbook panel.docbook questions.docbook contrib.docbook configkde.docbook nonkdeapps.docbook winmng.docbook qt.docbook filemng.docbook sound.docbook webbrowse.docbook tips.docbook ; do \
++	@for base in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
-+	for base in kdeapps.docbook desktop.docbook getkde.docbook moreinfo.docbook intro.docbook index.docbook misc.docbook install.docbook notrelated.docbook TODO about.docbook panel.docbook questions.docbook contrib.docbook configkde.docbook nonkdeapps.docbook winmng.docbook qt.docbook filemng.docbook sound.docbook webbrowse.docbook tips.docbook ; do \
++	for base in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq/$$base ;\
  	done
  
@@ -45459,7 +61953,7 @@
  #>+ 5
  distdir-nls:
 -	for file in notrelated.docbook contrib.docbook TODO nonkdeapps.docbook getkde.docbook install.docbook index.docbook desktop.docbook about.docbook moreinfo.docbook tips.docbook filemng.docbook qt.docbook configkde.docbook kdeapps.docbook sound.docbook intro.docbook misc.docbook questions.docbook webbrowse.docbook panel.docbook winmng.docbook ; do \
-+	for file in kdeapps.docbook desktop.docbook getkde.docbook moreinfo.docbook intro.docbook index.docbook misc.docbook install.docbook notrelated.docbook TODO about.docbook panel.docbook questions.docbook contrib.docbook configkde.docbook nonkdeapps.docbook winmng.docbook qt.docbook filemng.docbook sound.docbook webbrowse.docbook tips.docbook ; do \
++	for file in TODO configkde.docbook qt.docbook tips.docbook getkde.docbook filemng.docbook contrib.docbook webbrowse.docbook about.docbook misc.docbook panel.docbook sound.docbook questions.docbook moreinfo.docbook notrelated.docbook intro.docbook kdeapps.docbook install.docbook desktop.docbook winmng.docbook nonkdeapps.docbook index.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -45473,7 +61967,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45483,7 +61985,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45491,7 +61993,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -45504,7 +62006,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -45518,7 +62020,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -45526,7 +62028,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -45534,7 +62036,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -45547,7 +62049,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45556,7 +62058,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45568,28 +62070,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +741,7 @@
+@@ -732,7 +740,7 @@
  KDE_DIST=kdeprintingglossary.docbook index.docbook Makefile.in checkxrefs Makefile.am index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdeprintingglossary.docbook checkxrefs index.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kdeprintingglossary.docbook checkxrefs 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) checkxrefs index.docbook kdeprintingglossary.docbook 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
+@@ -759,20 +767,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary
 -	@for base in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
-+	@for base in index.docbook kdeprintingglossary.docbook checkxrefs ; do \
++	@for base in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
-+	for base in index.docbook kdeprintingglossary.docbook checkxrefs ; do \
++	for base in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary/$$base ;\
  	done
  
@@ -45597,7 +62099,7 @@
  #>+ 5
  distdir-nls:
 -	for file in kdeprintingglossary.docbook checkxrefs index.docbook ; do \
-+	for file in index.docbook kdeprintingglossary.docbook checkxrefs ; do \
++	for file in checkxrefs index.docbook kdeprintingglossary.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -45611,7 +62113,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45621,7 +62131,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45629,7 +62139,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -45642,7 +62152,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -45656,7 +62166,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -45664,7 +62174,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -45672,7 +62182,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -45685,7 +62195,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -545,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45694,7 +62204,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -583,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45716,7 +62226,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45726,7 +62244,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45734,7 +62252,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -45747,7 +62265,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -45761,7 +62279,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -45769,7 +62287,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -45777,7 +62295,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -45790,7 +62308,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -545,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45799,7 +62317,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -583,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45811,28 +62329,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -733,7 +742,7 @@
+@@ -733,7 +741,7 @@
  KDE_DIST=configuring.docbook plugins.docbook index.docbook regular-expressions.docbook mdi.docbook configdialog02.png fundamentals.docbook Makefile.in man-kate.1.docbook unhighlighted.png part.docbook highlighting.docbook menus.docbook configdialog01.png advanced.docbook highlighted.png Makefile.am kate.png mimetypechooser.png index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) part.docbook configdialog01.png mdi.docbook configdialog02.png kate.png index.docbook fundamentals.docbook menus.docbook mimetypechooser.png advanced.docbook plugins.docbook TODO configuring.docbook regular-expressions.docbook highlighted.png highlighting.docbook man-kate.1.docbook unhighlighted.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -760,20 +769,20 @@
+@@ -760,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
 -	@for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
-+	@for base in part.docbook configdialog01.png mdi.docbook configdialog02.png kate.png index.docbook fundamentals.docbook menus.docbook mimetypechooser.png advanced.docbook plugins.docbook TODO configuring.docbook regular-expressions.docbook highlighted.png highlighting.docbook man-kate.1.docbook unhighlighted.png ; do \
++	@for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
-+	for base in part.docbook configdialog01.png mdi.docbook configdialog02.png kate.png index.docbook fundamentals.docbook menus.docbook mimetypechooser.png advanced.docbook plugins.docbook TODO configuring.docbook regular-expressions.docbook highlighted.png highlighting.docbook man-kate.1.docbook unhighlighted.png ; do \
++	for base in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate/$$base ;\
  	done
  
@@ -45840,7 +62358,7 @@
  #>+ 5
  distdir-nls:
 -	for file in kate.png TODO highlighting.docbook advanced.docbook part.docbook index.docbook mdi.docbook configuring.docbook mimetypechooser.png fundamentals.docbook plugins.docbook highlighted.png regular-expressions.docbook unhighlighted.png menus.docbook configdialog01.png configdialog02.png man-kate.1.docbook ; do \
-+	for file in part.docbook configdialog01.png mdi.docbook configdialog02.png kate.png index.docbook fundamentals.docbook menus.docbook mimetypechooser.png advanced.docbook plugins.docbook TODO configuring.docbook regular-expressions.docbook highlighted.png highlighting.docbook man-kate.1.docbook unhighlighted.png ; do \
++	for file in configdialog02.png TODO mimetypechooser.png unhighlighted.png plugins.docbook regular-expressions.docbook highlighting.docbook kate.png man-kate.1.docbook menus.docbook configuring.docbook advanced.docbook fundamentals.docbook part.docbook index.docbook highlighted.png mdi.docbook configdialog01.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -45854,7 +62372,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45864,7 +62390,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45872,7 +62398,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -45885,7 +62411,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -45899,7 +62425,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -45907,7 +62433,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -45915,7 +62441,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -45928,7 +62454,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45937,7 +62463,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45949,6 +62475,39 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -732,7 +740,7 @@
+ KDE_DIST=midi.docbook index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook midi.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) midi.docbook index.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -759,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
+-	@for base in index.docbook midi.docbook ; do \
++	@for base in midi.docbook index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook midi.docbook ; do \
++	for base in midi.docbook index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook midi.docbook ; do \
++	for file in midi.docbook index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
 --- doc/kcontrol/background/Makefile.in
 +++ doc/kcontrol/background/Makefile.in
 @@ -107,6 +107,7 @@
@@ -45959,7 +62518,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45969,7 +62536,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -45977,7 +62544,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -45990,7 +62557,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -46004,7 +62571,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -46012,7 +62579,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -46020,7 +62587,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -46033,7 +62600,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -46042,7 +62609,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -46064,7 +62631,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46074,7 +62649,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -46082,7 +62657,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -46095,7 +62670,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -46109,7 +62684,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -46117,7 +62692,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -46125,7 +62700,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -46138,7 +62713,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -46147,7 +62722,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -46169,7 +62744,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46179,7 +62762,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -46187,7 +62770,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -46200,7 +62783,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -46214,7 +62797,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -46222,7 +62805,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -46230,7 +62813,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -46243,7 +62826,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -46252,7 +62835,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -46274,7 +62857,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46284,7 +62875,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -46292,7 +62883,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -46305,7 +62896,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -46319,7 +62910,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -46327,7 +62918,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -46335,7 +62926,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -46348,7 +62939,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -46357,7 +62948,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -46379,7 +62970,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46389,7 +62988,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -46397,7 +62996,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -46410,7 +63009,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -46424,7 +63023,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -46432,7 +63031,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -46440,7 +63039,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -46453,7 +63052,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -46462,7 +63061,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -46484,7 +63083,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46494,7 +63101,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -46502,7 +63109,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -46515,7 +63122,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -46529,7 +63136,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -46537,7 +63144,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -46545,7 +63152,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -46558,7 +63165,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -46567,7 +63174,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -46589,7 +63196,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46599,7 +63214,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -46607,7 +63222,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -46620,7 +63235,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -46634,7 +63249,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -46642,7 +63257,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -46650,7 +63265,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -46663,7 +63278,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -46672,7 +63287,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -46694,7 +63309,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46704,7 +63327,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -46712,7 +63335,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -46725,7 +63348,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -46739,7 +63362,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -46747,7 +63370,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -46755,7 +63378,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -46768,7 +63391,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -46777,7 +63400,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -46799,7 +63422,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46809,7 +63440,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -46817,7 +63448,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -46830,7 +63461,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -46844,7 +63475,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -46852,7 +63483,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -46860,7 +63491,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -46873,7 +63504,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -46882,7 +63513,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -46904,7 +63535,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46914,7 +63553,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -46922,7 +63561,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -46935,7 +63574,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -46949,7 +63588,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -46957,7 +63596,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -46965,7 +63604,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -46978,7 +63617,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -46987,7 +63626,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -47009,7 +63648,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47019,7 +63666,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -47027,7 +63674,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -47040,7 +63687,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -47054,7 +63701,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -47062,7 +63709,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -47070,7 +63717,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -47083,7 +63730,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -47092,7 +63739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -47114,7 +63761,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47124,7 +63779,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -47132,7 +63787,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -47145,7 +63800,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -47159,7 +63814,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -47167,7 +63822,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -47175,7 +63830,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -47188,7 +63843,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -47197,7 +63852,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -47219,7 +63874,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47229,7 +63892,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -47237,7 +63900,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -47250,7 +63913,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -47264,7 +63927,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -47272,7 +63935,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -47280,7 +63943,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -47293,7 +63956,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -47302,7 +63965,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -47314,7 +63977,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +741,7 @@
+@@ -732,7 +740,7 @@
  KDE_DIST=kfileman1.png index.docbook Makefile.in kfileman2.png Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -47323,7 +63986,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
+@@ -759,20 +767,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
@@ -47357,7 +64020,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47367,7 +64038,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -47375,7 +64046,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -47388,7 +64059,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -47402,7 +64073,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -47410,7 +64081,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -47418,7 +64089,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -47431,7 +64102,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -47440,7 +64111,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -47462,7 +64133,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47472,7 +64151,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -47480,7 +64159,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -47493,7 +64172,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -47507,7 +64186,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -47515,7 +64194,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -47523,7 +64202,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -47536,7 +64215,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -47545,7 +64224,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -47567,7 +64246,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47577,7 +64264,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -47585,7 +64272,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -47598,7 +64285,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -47612,7 +64299,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -47620,7 +64307,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -47628,7 +64315,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -47641,7 +64328,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -47650,7 +64337,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -47672,7 +64359,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47682,7 +64377,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -47690,7 +64385,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -47703,7 +64398,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -47717,7 +64412,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -47725,7 +64420,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -47733,7 +64428,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -47746,7 +64441,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -47755,7 +64450,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -47777,7 +64472,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47787,7 +64490,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -47795,7 +64498,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -47808,7 +64511,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -47822,7 +64525,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -47830,7 +64533,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -47838,7 +64541,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -47851,7 +64554,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -47860,7 +64563,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -47882,7 +64585,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47892,7 +64603,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -47900,7 +64611,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -47913,7 +64624,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -47927,7 +64638,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -47935,7 +64646,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -47943,7 +64654,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -47956,7 +64667,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -47965,7 +64676,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -47987,7 +64698,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47997,7 +64716,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -48005,7 +64724,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -48018,7 +64737,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -48032,7 +64751,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -48040,7 +64759,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -48048,7 +64767,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -48061,7 +64780,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -48070,7 +64789,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -48092,7 +64811,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48102,7 +64829,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -48110,7 +64837,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -48123,7 +64850,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -48137,7 +64864,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -48145,7 +64872,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -48153,7 +64880,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -48166,7 +64893,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -48175,7 +64902,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -48197,7 +64924,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48207,7 +64942,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -48215,7 +64950,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -48228,7 +64963,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -48242,7 +64977,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -48250,7 +64985,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -48258,7 +64993,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -48271,7 +65006,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -48280,7 +65015,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -48302,7 +65037,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48312,7 +65055,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -48320,7 +65063,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -48333,7 +65076,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -48347,7 +65090,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -48355,7 +65098,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -48363,7 +65106,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -48376,7 +65119,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -48385,7 +65128,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -48407,7 +65150,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48417,7 +65168,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -48425,7 +65176,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -48438,7 +65189,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -48452,7 +65203,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -48460,7 +65211,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -48468,7 +65219,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -48481,7 +65232,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -48490,7 +65241,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -48512,7 +65263,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48522,7 +65281,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -48530,7 +65289,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -48543,7 +65302,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -48557,7 +65316,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -48565,7 +65324,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -48573,7 +65332,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -48586,7 +65345,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -48595,7 +65354,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -48617,7 +65376,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48627,7 +65394,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -48635,7 +65402,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -48648,7 +65415,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -48662,7 +65429,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -48670,7 +65437,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -48678,7 +65445,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -48691,7 +65458,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -48700,7 +65467,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -48722,7 +65489,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48732,7 +65507,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -48740,7 +65515,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -48753,7 +65528,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -48767,7 +65542,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -48775,7 +65550,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -48783,7 +65558,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -48796,7 +65571,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -48805,7 +65580,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -48827,7 +65602,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48837,7 +65620,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -48845,7 +65628,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -48858,7 +65641,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -48872,7 +65655,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -48880,7 +65663,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -48888,7 +65671,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -48901,7 +65684,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -48910,7 +65693,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -48932,7 +65715,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48942,7 +65733,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -48950,7 +65741,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -48963,7 +65754,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -48977,7 +65768,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -48985,7 +65776,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -48993,7 +65784,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -49006,7 +65797,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -49015,7 +65806,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -49037,7 +65828,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49047,7 +65846,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -49055,7 +65854,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -49068,7 +65867,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -49082,7 +65881,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -49090,7 +65889,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -49098,7 +65897,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -49111,7 +65910,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -49120,7 +65919,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -49132,7 +65931,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +741,7 @@
+@@ -732,7 +740,7 @@
  KDE_DIST=index.docbook nsplugin.docbook Makefile.in Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -49141,7 +65940,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
+@@ -759,20 +767,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml
@@ -49175,7 +65974,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49185,7 +65992,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -49193,7 +66000,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -49206,7 +66013,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -49220,7 +66027,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -49228,7 +66035,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -49236,7 +66043,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -49249,7 +66056,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -49258,7 +66065,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -49280,7 +66087,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49290,7 +66105,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -49298,7 +66113,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -49311,7 +66126,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -49325,7 +66140,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -49333,7 +66148,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -49341,7 +66156,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -49354,7 +66169,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -49363,7 +66178,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -49385,7 +66200,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49395,7 +66218,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -49403,7 +66226,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -49416,7 +66239,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -49430,7 +66253,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -49438,7 +66261,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -49446,7 +66269,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -49459,16 +66282,16 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  xdg_menudir = @xdg_menudir@
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
 -SUBDIRS =. background khtml helpindex proxy kcmtaskbar language passwords email fonts desktopbehavior cookies useragent kcmfontinst ebrowsing panel cache filetypes windowmanagement kcmlaunch arts desktop filemanager bell panelappearance crypto kwindecoration screensaver smb kcmcss mouse energy kcmstyle clock kcmaccess keyboard kcmsmserver colors performance kcmnotify netpref kcmkonsole keys kdm icons spellchecking
-+SUBDIRS =. clock passwords kcmfontinst kcmlaunch helpindex bell desktop keyboard cache screensaver email icons arts kcmcss mouse netpref panel colors khtml crypto filetypes cookies fonts kcmstyle desktopbehavior windowmanagement filemanager kcmkonsole kcmsmserver keys background kcmaccess energy performance language spellchecking kdm kcmnotify useragent ebrowsing kcmtaskbar kwindecoration smb proxy panelappearance
++SUBDIRS =. kdm smb spellchecking bell arts keys cookies filetypes desktop cache clock email fonts icons khtml filemanager mouse panel proxy desktopbehavior passwords panelappearance ebrowsing background kcmaccess colors crypto energy kcmstyle netpref kcmlaunch kcmcss kcmnotify kcmsmserver screensaver windowmanagement kwindecoration kcmkonsole language useragent helpindex keyboard kcmtaskbar kcmfontinst performance
  KDE_LANG = en
  KDE_DOCS = AUTO
  #>- all: all-recursive
-@@ -563,7 +572,7 @@
+@@ -563,7 +571,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -49477,7 +66300,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +610,9 @@
+@@ -601,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -49489,6 +66312,39 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -899,7 +907,7 @@
+ KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png index.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -926,20 +934,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol
+-	@for base in index.docbook screenshot.png ; do \
++	@for base in screenshot.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook screenshot.png ; do \
++	for base in screenshot.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook screenshot.png ; do \
++	for file in screenshot.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
 --- doc/kcontrol/mouse/Makefile.in
 +++ doc/kcontrol/mouse/Makefile.in
 @@ -107,6 +107,7 @@
@@ -49499,7 +66355,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49509,7 +66373,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -49517,7 +66381,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -49530,7 +66394,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -49544,7 +66408,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -49552,7 +66416,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -49560,7 +66424,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -49573,7 +66437,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -49582,7 +66446,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -49604,7 +66468,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49614,7 +66486,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -49622,7 +66494,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -49635,7 +66507,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -49649,7 +66521,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -49657,7 +66529,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -49665,7 +66537,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -49678,7 +66550,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -49687,7 +66559,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -49709,7 +66581,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49719,7 +66599,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -49727,7 +66607,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -49740,7 +66620,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -49754,7 +66634,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -49762,7 +66642,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -49770,7 +66650,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -49783,7 +66663,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -49792,7 +66672,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -49814,7 +66694,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49824,7 +66712,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -49832,7 +66720,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -49845,7 +66733,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -49859,7 +66747,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -49867,7 +66755,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -49875,7 +66763,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -49888,7 +66776,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -49897,7 +66785,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -49919,7 +66807,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49929,7 +66825,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -49937,7 +66833,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -49950,7 +66846,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -49964,7 +66860,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -49972,7 +66868,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -49980,7 +66876,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -49993,7 +66889,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -50002,7 +66898,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -50024,7 +66920,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50034,7 +66938,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -50042,7 +66946,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -50055,7 +66959,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -50069,7 +66973,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -50077,7 +66981,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -50085,7 +66989,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -50098,7 +67002,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -50107,7 +67011,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -50129,7 +67033,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50139,7 +67051,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -50147,7 +67059,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -50160,7 +67072,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -50174,7 +67086,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -50182,7 +67094,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -50190,7 +67102,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -50203,7 +67115,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -50212,7 +67124,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -50234,7 +67146,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50244,7 +67164,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -50252,7 +67172,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -50265,7 +67185,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -50279,7 +67199,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -50287,7 +67207,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -50295,7 +67215,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -50308,7 +67228,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -50317,7 +67237,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -50339,7 +67259,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50349,7 +67277,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -50357,7 +67285,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -50370,7 +67298,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -50384,7 +67312,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -50392,7 +67320,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -50400,7 +67328,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -50413,7 +67341,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -50422,7 +67350,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -50444,7 +67372,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50454,7 +67390,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -50462,7 +67398,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -50475,7 +67411,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -50489,7 +67425,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -50497,7 +67433,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -50505,7 +67441,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -50518,7 +67454,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -50527,7 +67463,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -50549,7 +67485,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50559,7 +67503,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -50567,7 +67511,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -50580,7 +67524,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -50594,7 +67538,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -50602,7 +67546,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -50610,7 +67554,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -50623,7 +67567,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -50632,7 +67576,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -50654,7 +67598,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50664,7 +67616,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -50672,7 +67624,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -50685,7 +67637,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -50699,7 +67651,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -50707,7 +67659,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -50715,7 +67667,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -50728,7 +67680,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -50737,7 +67689,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -50759,7 +67711,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50769,7 +67729,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -50777,7 +67737,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -50790,7 +67750,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -50804,7 +67764,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -50812,7 +67772,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -50820,7 +67780,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -50833,7 +67793,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -50842,7 +67802,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -50864,7 +67824,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50874,7 +67842,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -50882,7 +67850,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -50895,7 +67863,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -50909,7 +67877,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -50917,7 +67885,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -50925,7 +67893,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -50938,7 +67906,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -50947,7 +67915,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -50969,7 +67937,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50979,7 +67955,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -50987,7 +67963,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -51000,7 +67976,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -51014,7 +67990,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -51022,7 +67998,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -51030,7 +68006,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -51043,7 +68019,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -51052,7 +68028,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -51064,32 +68040,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +738,10 @@
+@@ -729,10 +737,10 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png highlights.docbook cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png kprinter_called_from_run_command.png index.docbook cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png cupsaddprinterwizard3_networkscan.png ps-boxes.png cupsserverconfiguration4_directories.png final-word.docbook cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard1.png cups-config.docbook add-printer-wiz.docbook cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png cupsserverconfiguration8_networkgeneral.png rlpr.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png kcron_to_be_printed.png theory.docbook Makefile.am extensions.docbook cupsserverconfiguration2_general.png index.cache.bz2 
-+KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png cupsaddprinterwizard4_networkscan_config.png highlights.docbook cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png index.docbook kprinter_called_from_run_command.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png cupsaddprinterwizard3_networkscan.png ps-boxes.png final-word.docbook cupsserverconfiguration4_directories.png cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration5_HTTP.png cups-config.docbook cupsaddprinterwizard1.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration9_networkclients.png add-printer-wiz.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration8_networkgeneral.png rlpr.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration1_welcome.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png kcron_to_be_printed.png theory.docbook Makefile.am extensions.docbook cupsserverconfiguration2_general.png index.cache.bz2 
++KDE_DIST=lpr-bsd.docbook steinbruch_scaled.png cupsserverconfiguration_securityoverview.png tech-overview.docbook kcontrol-icon.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration11_browsingconnections.png highlights.docbook cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png cr32-action-wizard.png kprinter-as-netscape-printcommand.png kprinter.png lprng.docbook cupsserverconfiguration_resourceadminaddprinters_defineaccess.png index.docbook kprinter_called_from_run_command.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsoptions.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration_resourceadminaccessmasks.png ps-boxes.png cupsaddprinterwizard3_networkscan.png final-word.docbook cupsserverconfiguration4_directories.png cupsserverconfiguration10_browsinggeneral.png external-command.docbook getting-started.docbook kcontrolcenter-printmanager-jobcontrol-2.png kdeprint-jobviewer.png cupsserverconfiguration14_browsingrelay.png Makefile.in cupsserverconfiguration7_miscellanious.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration5_HTTP.png cups-config.docbook cupsaddprinterwizard1.png cupsserverconfiguration9_networkclients.png cupsserverconfig_browse_relay_add_button.png add-printer-wiz.docbook cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png rlpr.docbook cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration1_welcome.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png lpd.docbook cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration3_logging.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration6_encryption.png kprinter-kivio.png theory.docbook kcron_to_be_printed.png Makefile.am extensions.docbook cupsserverconfiguration2_general.png index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kcontrol-icon.png cupsoptions.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration4_directories.png getting-started.docbook cupsaddprinterwizard2_backendselection.png final-word.docbook highlights.docbook kprinter_called_from_run_command.png kdeprint-jobviewer.png cupsserverconfiguration3_logging.png cupsaddprinterwizard1.png external-command.docbook cupsserverconfiguration_resourceadminaddprinters.png kprinter_with_kcron_developer_special.png add-printer-wiz.docbook lpd.docbook cupsserverconfiguration7_miscellanious.png cups-config.docbook kprinter-kivio.png cupsserverconfiguration2_general.png cupsserverconfiguration_resourceadminaccessmasks.png tech-overview.docbook cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration1_welcome.png kprinter-as-netscape-printcommand.png rlpr.docbook index.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cups-filterarchitecture-kivio-70Percent-scaled.png ps-boxes.png kprinter.png theory.docbook lprng.docbook lpr-bsd.docbook cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingconnections.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration5_HTTP.png cr32-action-wizard.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_securityoverview.png cupsserverconfiguration8_networkgeneral.png kcron_to_be_printed.png cupsserverconfig_browse_relay_add_button.png extensions.docbook cupsserverconfiguration15b_resourceallprinters_defineaccess.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration6_encryption.png steinbruch_scaled.png cupsserverconfiguration14_browsingrelay.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
+@@ -759,20 +767,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
 -	@for base in kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; do \
-+	@for base in kcontrol-icon.png cupsoptions.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration4_directories.png getting-started.docbook cupsaddprinterwizard2_backendselection.png final-word.docbook highlights.docbook kprinter_called_from_run_command.png kdeprint-jobviewer.png cupsserverconfiguration3_logging.png cupsaddprinterwizard1.png external-command.docbook cupsserverconfiguration_resourceadminaddprinters.png kprinter_with_kcron_developer_special.png add-printer-wiz.docbook lpd.docbook cupsserverconfiguration7_miscellanious.png cups-config.docbook kprinter-kivio.png cupsserverconfiguration2_general.png cupsserverconfiguration_resourceadminaccessmasks.png tech-overview.docbook cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration1_welcome.png kprinter-as-netscape-printcommand.png rlpr.docbook index.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cups-filterarchitecture-kivio-70Percent-scaled.png ps-boxes.png kprinter.png theory.docbook lprng.docbook lpr-bsd.docbook cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingconnections.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration5_HTTP.png cr32-action-wizard.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_securityoverview.png cupsserverconfiguration8_networkgeneral.png kcron_to_be_printed.png cupsserverconfig_browse_relay_add_button.png extensions.docbook cupsserverconfiguration15b_resourceallprinters_defineaccess.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration6_encryption.png steinbruch_scaled.png cupsserverconfiguration14_browsingrelay.png ; do \
++	@for base in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; do \
-+	for base in kcontrol-icon.png cupsoptions.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration4_directories.png getting-started.docbook cupsaddprinterwizard2_backendselection.png final-word.docbook highlights.docbook kprinter_called_from_run_command.png kdeprint-jobviewer.png cupsserverconfiguration3_logging.png cupsaddprinterwizard1.png external-command.docbook cupsserverconfiguration_resourceadminaddprinters.png kprinter_with_kcron_developer_special.png add-printer-wiz.docbook lpd.docbook cupsserverconfiguration7_miscellanious.png cups-config.docbook kprinter-kivio.png cupsserverconfiguration2_general.png cupsserverconfiguration_resourceadminaccessmasks.png tech-overview.docbook cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration1_welcome.png kprinter-as-netscape-printcommand.png rlpr.docbook index.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cups-filterarchitecture-kivio-70Percent-scaled.png ps-boxes.png kprinter.png theory.docbook lprng.docbook lpr-bsd.docbook cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingconnections.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration5_HTTP.png cr32-action-wizard.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_securityoverview.png cupsserverconfiguration8_networkgeneral.png kcron_to_be_printed.png cupsserverconfig_browse_relay_add_button.png extensions.docbook cupsserverconfiguration15b_resourceallprinters_defineaccess.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration6_encryption.png steinbruch_scaled.png cupsserverconfiguration14_browsingrelay.png ; do \
++	for base in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
  	done
  
@@ -51097,7 +68073,7 @@
  #>+ 5
  distdir-nls:
 -	for file in kprinter-kivio.png lpr-bsd.docbook ps-boxes.png index.docbook getting-started.docbook theory.docbook lpd.docbook cupsserverconfiguration10_browsinggeneral.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration7_miscellanious.png cupsserverconfig_browse_relay_add_button.png cupsserverconfiguration11_browsingconnections.png rlpr.docbook steinbruch_scaled.png kcontrol-icon.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration9_networkclients.png kprinter-as-netscape-printcommand.png cupsserverconfiguration3_logging.png cr32-action-wizard.png tech-overview.docbook lprng.docbook kprinter.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png external-command.docbook extensions.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cupsserverconfiguration8_networkgeneral.png cupsserverconfiguration6_encryption.png cupsserverconfiguration_resourceadminaccessmasks.png final-word.docbook cupsserverconfiguration12_browsingtimeouts.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration14_browsingrelay.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration_securityoverview.png kprinter_called_from_run_command.png cupsserverconfiguration2_general.png cupsserverconfiguration4_directories.png cups-config.docbook cupsaddprinterwizard3_networkscan.png add-printer-wiz.docbook cupsserverconfiguration5_HTTP.png cupsoptions.docbook cupsserverconfiguration1_welcome.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png highlights.docbook cupsaddprinterwizard1.png cupsaddprinterwizard3_networkscan_results.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration_resourceadminauthorization.png kprinter_with_kcron_developer_special.png ; do \
-+	for file in kcontrol-icon.png cupsoptions.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration4_directories.png getting-started.docbook cupsaddprinterwizard2_backendselection.png final-word.docbook highlights.docbook kprinter_called_from_run_command.png kdeprint-jobviewer.png cupsserverconfiguration3_logging.png cupsaddprinterwizard1.png external-command.docbook cupsserverconfiguration_resourceadminaddprinters.png kprinter_with_kcron_developer_special.png add-printer-wiz.docbook lpd.docbook cupsserverconfiguration7_miscellanious.png cups-config.docbook kprinter-kivio.png cupsserverconfiguration2_general.png cupsserverconfiguration_resourceadminaccessmasks.png tech-overview.docbook cupsserverconfiguration11_browsingmasks.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration1_welcome.png kprinter-as-netscape-printcommand.png rlpr.docbook index.docbook cupsserverconfiguration15c_resourceallprinters_defineaccess.png cups-filterarchitecture-kivio-70Percent-scaled.png ps-boxes.png kprinter.png theory.docbook lprng.docbook lpr-bsd.docbook cupsserverconfig_browsingmasks_add_button.png cupsserverconfiguration11_browsingconnections.png cupsaddprinterwizard3_networkscan_results.png cupsaddprinterwizard4_networkscan_config.png cupsserverconfiguration10_browsinggeneral.png cupsserverconfiguration9_networkclients.png cupsserverconfiguration12_browsingtimeouts.png cupsserverconfiguration5_HTTP.png cr32-action-wizard.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_securityoverview.png cupsserverconfiguration8_networkgeneral.png kcron_to_be_printed.png cupsserverconfig_browse_relay_add_button.png extensions.docbook cupsserverconfiguration15b_resourceallprinters_defineaccess.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png cupsserverconfiguration6_encryption.png steinbruch_scaled.png cupsserverconfiguration14_browsingrelay.png ; do \
++	for file in cupsserverconfiguration_resourceadminaddprinters.png cupsserverconfiguration5_HTTP.png cupsaddprinterwizard3_networkscan.png cupsserverconfiguration_resourceadminaddprinters_defineaccess.png cupsserverconfiguration15a_resourceallprinters_defineaccess.png ps-boxes.png kcontrol-icon.png tech-overview.docbook cupsserverconfig_browsingmasks_add_button.png kprinter_called_from_run_command.png kcron_to_be_printed.png kdeprint-jobviewer.png cupsserverconfiguration8_networkgeneral.png theory.docbook cupsaddprinterwizard1.png cupsoptions.docbook cupsaddprinterwizard4_networkscan_config.png external-command.docbook kprinter.png cupsserverconfiguration10_browsinggeneral.png cups-filterarchitecture-kivio-70Percent-scaled.png cupsserverconfiguration3_logging.png cupsaddprinterwizard2_backendselection.png cupsserverconfiguration7_miscellanious.png cupsserverconfiguration4_directories.png extensions.docbook kprinter-kivio.png cupsserverconfiguration_securityoverview.png lpd.docbook cupsserverconfiguration14_browsingrelay.png cupsserverconfiguration15c_resourceallprinters_defineaccess.png cr32-action-wizard.png cupsserverconfiguration_resourceadminaccessmasks.png rlpr.docbook kprinter-as-netscape-printcommand.png cupsserverconfiguration1_welcome.png highlights.docbook getting-started.docbook kprinter_with_kcron_developer_special.png cupsserverconfiguration12_browsingtimeouts.png add-printer-wiz.docbook cupsaddprinterwizard3_networkscan_results.png cupsserverconfiguration15b_resourceallprinters_defineaccess.png final-word.docbook cupsserverconfiguration2_general.png cups-config.docbook steinbruch_scaled.png cupsserverconfiguration11_browsingconnections.png index.docbook cupsserverconfiguration_resourceadminauthorization.png cupsserverconfiguration11_browsingmasks.png kcontrolcenter-printmanager-jobcontrol-2.png cupsserverconfig_browse_relay_add_button.png lpr-bsd.docbook cupsserverconfiguration6_encryption.png lprng.docbook cupsserverconfiguration9_networkclients.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -51111,7 +68087,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51121,7 +68105,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -51129,7 +68113,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -51142,7 +68126,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -51156,7 +68140,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -51164,7 +68148,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -51172,7 +68156,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -51185,7 +68169,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -545,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -51194,7 +68178,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -583,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -51216,7 +68200,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51226,7 +68218,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -51234,7 +68226,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -51247,7 +68239,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -51261,7 +68253,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -51269,7 +68261,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -51277,7 +68269,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -51290,7 +68282,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -545,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -51299,7 +68291,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -583,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -51311,39 +68303,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -735,7 +744,7 @@
- KDE_DIST=index.docbook kdmrc-ref.docbook Makefile.in Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdmrc-ref.docbook index.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kdmrc-ref.docbook 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -762,20 +771,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm
--	@for base in kdmrc-ref.docbook index.docbook ; do \
-+	@for base in index.docbook kdmrc-ref.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in kdmrc-ref.docbook index.docbook ; do \
-+	for base in index.docbook kdmrc-ref.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdm/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in kdmrc-ref.docbook index.docbook ; do \
-+	for file in index.docbook kdmrc-ref.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kfind/Makefile.in
 +++ doc/kfind/Makefile.in
 @@ -107,6 +107,7 @@
@@ -51354,7 +68313,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51364,7 +68331,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -51372,7 +68339,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -51385,7 +68352,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -51399,7 +68366,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -51407,7 +68374,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -51415,7 +68382,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -51428,7 +68395,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -545,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -51437,7 +68404,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -583,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -51449,39 +68416,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -733,7 +742,7 @@
- KDE_DIST=man-kfind.1.docbook index.docbook Makefile.in Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-kfind.1.docbook index.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook man-kfind.1.docbook 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -760,20 +769,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kfind
--	@for base in man-kfind.1.docbook index.docbook ; do \
-+	@for base in index.docbook man-kfind.1.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kfind/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kfind/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in man-kfind.1.docbook index.docbook ; do \
-+	for base in index.docbook man-kfind.1.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kfind/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in man-kfind.1.docbook index.docbook ; do \
-+	for file in index.docbook man-kfind.1.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/khelpcenter/Makefile.in
 +++ doc/khelpcenter/Makefile.in
 @@ -123,6 +123,7 @@
@@ -51492,7 +68426,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51502,7 +68444,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -51510,7 +68452,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -51523,7 +68465,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -51537,7 +68479,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -51545,7 +68487,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -51553,7 +68495,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -51566,7 +68508,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -563,7 +572,7 @@
+@@ -563,7 +571,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -51575,7 +68517,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +610,9 @@
+@@ -601,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -51587,32 +68529,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -896,10 +905,10 @@
- .NOEXPORT:
+@@ -899,7 +907,7 @@
+ KDE_DIST=whatiskde.docbook kdelogo2.png support.docbook index.docbook khelpcenter.png shadow1.png pointers.png konq.css Makefile.in lines2.png help.docbook lines.png welcome.docbook contact.docbook Makefile.am background.png index.cache.bz2 bgtable.png 
  
- #>+ 2
--KDE_DIST=whatiskde.docbook kdelogo2.png support.docbook index.docbook khelpcenter.png shadow1.png pointers.png konq.css Makefile.in lines2.png help.docbook lines.png welcome.docbook contact.docbook Makefile.am background.png index.cache.bz2 bgtable.png 
-+KDE_DIST=whatiskde.docbook kdelogo2.png support.docbook index.docbook khelpcenter.png shadow1.png pointers.png konq.css Makefile.in lines2.png help.docbook lines.png welcome.docbook contact.docbook Makefile.am background.png bgtable.png index.cache.bz2 
- 
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) welcome.docbook lines2.png support.docbook khelpcenter.png whatiskde.docbook index.docbook konq.css kdelogo2.png pointers.png lines.png contact.docbook shadow1.png help.docbook bgtable.png background.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -926,20 +935,20 @@
+@@ -926,20 +934,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter
 -	@for base in index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook ; do \
-+	@for base in welcome.docbook lines2.png support.docbook khelpcenter.png whatiskde.docbook index.docbook konq.css kdelogo2.png pointers.png lines.png contact.docbook shadow1.png help.docbook bgtable.png background.png ; do \
++	@for base in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook ; do \
-+	for base in welcome.docbook lines2.png support.docbook khelpcenter.png whatiskde.docbook index.docbook konq.css kdelogo2.png pointers.png lines.png contact.docbook shadow1.png help.docbook bgtable.png background.png ; do \
++	for base in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/$$base ;\
  	done
  
@@ -51620,7 +68558,7 @@
  #>+ 5
  distdir-nls:
 -	for file in index.docbook lines2.png bgtable.png pointers.png whatiskde.docbook khelpcenter.png shadow1.png kdelogo2.png support.docbook lines.png konq.css background.png help.docbook welcome.docbook contact.docbook ; do \
-+	for file in welcome.docbook lines2.png support.docbook khelpcenter.png whatiskde.docbook index.docbook konq.css kdelogo2.png pointers.png lines.png contact.docbook shadow1.png help.docbook bgtable.png background.png ; do \
++	for file in background.png lines2.png konq.css khelpcenter.png support.docbook bgtable.png welcome.docbook help.docbook kdelogo2.png lines.png contact.docbook whatiskde.docbook pointers.png index.docbook shadow1.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -51634,7 +68572,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51644,7 +68590,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -51652,7 +68598,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -51665,7 +68611,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -51679,7 +68625,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -51687,7 +68633,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -51695,7 +68641,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -51708,7 +68654,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -545,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -51717,7 +68663,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -583,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -51729,32 +68675,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -730,10 +739,10 @@
+@@ -730,10 +738,10 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=k_menu_icon.png man-appletproxy.1.docbook screenshot_right.png bookmarks_icon.png man-kicker.1.docbook index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2 
-+KDE_DIST=k_menu_icon.png man-appletproxy.1.docbook bookmarks_icon.png screenshot_right.png man-kicker.1.docbook index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2 
++KDE_DIST=k_menu_icon.png bookmarks_icon.png screenshot_right.png man-appletproxy.1.docbook man-kicker.1.docbook index.docbook recent_docs_icon.png desktop_icon.png screenshot_left.png windowlist_icon.png Makefile.in quickbrowser_icon.png terminals_icon.png printsys_icon.png Makefile.am taskbar_group.png index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot_right.png desktop_icon.png bookmarks_icon.png taskbar_group.png screenshot_left.png index.docbook printsys_icon.png k_menu_icon.png windowlist_icon.png man-appletproxy.1.docbook recent_docs_icon.png man-kicker.1.docbook quickbrowser_icon.png terminals_icon.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -760,20 +769,20 @@
+@@ -760,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker
 -	@for base in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
-+	@for base in screenshot_right.png desktop_icon.png bookmarks_icon.png taskbar_group.png screenshot_left.png index.docbook printsys_icon.png k_menu_icon.png windowlist_icon.png man-appletproxy.1.docbook recent_docs_icon.png man-kicker.1.docbook quickbrowser_icon.png terminals_icon.png ; do \
++	@for base in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
-+	for base in screenshot_right.png desktop_icon.png bookmarks_icon.png taskbar_group.png screenshot_left.png index.docbook printsys_icon.png k_menu_icon.png windowlist_icon.png man-appletproxy.1.docbook recent_docs_icon.png man-kicker.1.docbook quickbrowser_icon.png terminals_icon.png ; do \
++	for base in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker/$$base ;\
  	done
  
@@ -51762,7 +68708,7 @@
  #>+ 5
  distdir-nls:
 -	for file in quickbrowser_icon.png man-kicker.1.docbook bookmarks_icon.png recent_docs_icon.png desktop_icon.png index.docbook printsys_icon.png taskbar_group.png k_menu_icon.png terminals_icon.png screenshot_left.png screenshot_right.png windowlist_icon.png man-appletproxy.1.docbook ; do \
-+	for file in screenshot_right.png desktop_icon.png bookmarks_icon.png taskbar_group.png screenshot_left.png index.docbook printsys_icon.png k_menu_icon.png windowlist_icon.png man-appletproxy.1.docbook recent_docs_icon.png man-kicker.1.docbook quickbrowser_icon.png terminals_icon.png ; do \
++	for file in man-appletproxy.1.docbook quickbrowser_icon.png man-kicker.1.docbook taskbar_group.png printsys_icon.png terminals_icon.png screenshot_right.png windowlist_icon.png k_menu_icon.png screenshot_left.png desktop_icon.png recent_docs_icon.png index.docbook bookmarks_icon.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -51776,7 +68722,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51786,7 +68740,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -51794,7 +68748,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -51807,7 +68761,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -51821,7 +68775,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -51829,7 +68783,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -51837,7 +68791,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -51850,7 +68804,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -51859,7 +68813,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -51881,7 +68835,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51891,7 +68853,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -51899,7 +68861,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -51912,7 +68874,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -51926,7 +68888,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -51934,7 +68896,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -51942,7 +68904,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -51955,7 +68917,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -51964,7 +68926,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -51986,7 +68948,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51996,7 +68966,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -52004,7 +68974,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -52017,7 +68987,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -52031,7 +69001,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -52039,7 +69009,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -52047,7 +69017,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -52060,7 +69030,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -52069,7 +69039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -52091,7 +69061,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52101,7 +69079,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -52109,7 +69087,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -52122,7 +69100,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -52136,7 +69114,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -52144,7 +69122,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -52152,7 +69130,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -52165,7 +69143,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -52174,7 +69152,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -52196,7 +69174,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52206,7 +69192,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -52214,7 +69200,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -52227,7 +69213,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -52241,7 +69227,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -52249,7 +69235,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -52257,7 +69243,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -52270,16 +69256,16 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  xdg_menudir = @xdg_menudir@
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
 -SUBDIRS =. processor interrupts devices samba protocols opengl sound usb pcmcia partitions nics xserver ioports scsi dma memory pci
-+SUBDIRS =. usb pci xserver opengl memory nics protocols samba ioports scsi devices processor dma interrupts pcmcia partitions sound
++SUBDIRS =. dma pci usb nics scsi interrupts devices xserver samba sound partitions memory pcmcia opengl processor ioports protocols
  KDE_LANG = en
  KDE_DOCS = AUTO
  #>- all: all-recursive
-@@ -563,7 +572,7 @@
+@@ -563,7 +571,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -52288,7 +69274,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +610,9 @@
+@@ -601,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -52310,7 +69296,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52320,7 +69314,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -52328,7 +69322,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -52341,7 +69335,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -52355,7 +69349,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -52363,7 +69357,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -52371,7 +69365,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -52384,7 +69378,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -52393,7 +69387,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -52415,7 +69409,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52425,7 +69427,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -52433,7 +69435,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -52446,7 +69448,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -52460,7 +69462,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -52468,7 +69470,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -52476,7 +69478,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -52489,7 +69491,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -52498,7 +69500,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -52520,7 +69522,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52530,7 +69540,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -52538,7 +69548,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -52551,7 +69561,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -52565,7 +69575,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -52573,7 +69583,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -52581,7 +69591,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -52594,7 +69604,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -52603,7 +69613,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -52625,7 +69635,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52635,7 +69653,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -52643,7 +69661,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -52656,7 +69674,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -52670,7 +69688,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -52678,7 +69696,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -52686,7 +69704,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -52699,7 +69717,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -52708,7 +69726,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -52730,7 +69748,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52740,7 +69766,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -52748,7 +69774,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -52761,7 +69787,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -52775,7 +69801,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -52783,7 +69809,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -52791,7 +69817,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -52804,7 +69830,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -52813,7 +69839,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -52835,7 +69861,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52845,7 +69879,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -52853,7 +69887,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -52866,7 +69900,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -52880,7 +69914,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -52888,7 +69922,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -52896,7 +69930,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -52909,7 +69943,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -52918,7 +69952,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -52940,7 +69974,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52950,7 +69992,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -52958,7 +70000,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -52971,7 +70013,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -52985,7 +70027,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -52993,7 +70035,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -53001,7 +70043,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -53014,7 +70056,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -53023,7 +70065,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -53045,7 +70087,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53055,7 +70105,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -53063,7 +70113,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -53076,7 +70126,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -53090,7 +70140,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -53098,7 +70148,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -53106,7 +70156,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -53119,7 +70169,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -53128,7 +70178,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -53150,7 +70200,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53160,7 +70218,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -53168,7 +70226,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -53181,7 +70239,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -53195,7 +70253,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -53203,7 +70261,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -53211,7 +70269,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -53224,7 +70282,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -53233,7 +70291,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -53255,7 +70313,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53265,7 +70331,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -53273,7 +70339,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -53286,7 +70352,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -53300,7 +70366,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -53308,7 +70374,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -53316,7 +70382,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -53329,7 +70395,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -53338,7 +70404,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -53360,7 +70426,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53370,7 +70444,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -53378,7 +70452,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -53391,7 +70465,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -53405,7 +70479,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -53413,7 +70487,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -53421,7 +70495,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -53434,7 +70508,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -53443,7 +70517,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -53465,7 +70539,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53475,7 +70557,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -53483,7 +70565,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -53496,7 +70578,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -53510,7 +70592,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -53518,7 +70600,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -53526,7 +70608,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -53539,7 +70621,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -53548,7 +70630,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -53570,7 +70652,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53580,7 +70670,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -53588,7 +70678,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -53601,7 +70691,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -53615,7 +70705,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -53623,7 +70713,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -53631,7 +70721,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -53644,7 +70734,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -53653,7 +70743,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -53675,7 +70765,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53685,7 +70783,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -53693,7 +70791,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -53706,7 +70804,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -53720,7 +70818,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -53728,7 +70826,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -53736,7 +70834,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -53749,7 +70847,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -53758,7 +70856,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -53770,32 +70868,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +738,10 @@
+@@ -729,10 +737,10 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=finger.docbook smtp.docbook pop3s.docbook bzip2.docbook imap.docbook file.docbook bzip.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook sftp.docbook thumbnail.docbook pop3.docbook index.docbook floppy.docbook print.docbook telnet.docbook http.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in man.docbook rlogin.docbook ldap.docbook help.docbook mailto.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook Makefile.am rlan.docbook lan.docbook webdav.docbook index.cache.bz2 
-+KDE_DIST=finger.docbook smtp.docbook pop3s.docbook bzip2.docbook imap.docbook bzip.docbook file.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook thumbnail.docbook sftp.docbook pop3.docbook index.docbook floppy.docbook print.docbook http.docbook telnet.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in man.docbook rlogin.docbook ldap.docbook help.docbook mailto.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook Makefile.am rlan.docbook lan.docbook webdav.docbook index.cache.bz2 
++KDE_DIST=finger.docbook pop3s.docbook smtp.docbook bzip2.docbook imap.docbook bzip.docbook file.docbook data.docbook webdavs.docbook cgi.docbook mrml.docbook thumbnail.docbook sftp.docbook index.docbook pop3.docbook floppy.docbook print.docbook http.docbook telnet.docbook nfs.docbook gopher.docbook nntp.docbook mac.docbook news.docbook https.docbook Makefile.in rlogin.docbook man.docbook ldap.docbook help.docbook mailto.docbook gzip.docbook ftp.docbook tar.docbook imaps.docbook info.docbook fish.docbook smb.docbook Makefile.am rlan.docbook lan.docbook webdav.docbook index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) floppy.docbook gzip.docbook webdav.docbook rlan.docbook lan.docbook https.docbook mailto.docbook file.docbook bzip.docbook pop3s.docbook info.docbook webdavs.docbook print.docbook index.docbook telnet.docbook http.docbook nntp.docbook ldap.docbook rlogin.docbook data.docbook mac.docbook ftp.docbook finger.docbook imap.docbook bzip2.docbook tar.docbook mrml.docbook imaps.docbook nfs.docbook fish.docbook pop3.docbook help.docbook smb.docbook news.docbook gopher.docbook smtp.docbook sftp.docbook man.docbook cgi.docbook thumbnail.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
+@@ -759,20 +767,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave
 -	@for base in thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook ; do \
-+	@for base in floppy.docbook gzip.docbook webdav.docbook rlan.docbook lan.docbook https.docbook mailto.docbook file.docbook bzip.docbook pop3s.docbook info.docbook webdavs.docbook print.docbook index.docbook telnet.docbook http.docbook nntp.docbook ldap.docbook rlogin.docbook data.docbook mac.docbook ftp.docbook finger.docbook imap.docbook bzip2.docbook tar.docbook mrml.docbook imaps.docbook nfs.docbook fish.docbook pop3.docbook help.docbook smb.docbook news.docbook gopher.docbook smtp.docbook sftp.docbook man.docbook cgi.docbook thumbnail.docbook ; do \
++	@for base in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook ; do \
-+	for base in floppy.docbook gzip.docbook webdav.docbook rlan.docbook lan.docbook https.docbook mailto.docbook file.docbook bzip.docbook pop3s.docbook info.docbook webdavs.docbook print.docbook index.docbook telnet.docbook http.docbook nntp.docbook ldap.docbook rlogin.docbook data.docbook mac.docbook ftp.docbook finger.docbook imap.docbook bzip2.docbook tar.docbook mrml.docbook imaps.docbook nfs.docbook fish.docbook pop3.docbook help.docbook smb.docbook news.docbook gopher.docbook smtp.docbook sftp.docbook man.docbook cgi.docbook thumbnail.docbook ; do \
++	for base in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave/$$base ;\
  	done
  
@@ -53803,7 +70901,7 @@
  #>+ 5
  distdir-nls:
 -	for file in thumbnail.docbook https.docbook pop3s.docbook mrml.docbook index.docbook webdav.docbook imaps.docbook floppy.docbook gzip.docbook nntp.docbook http.docbook ldap.docbook pop3.docbook gopher.docbook mailto.docbook nfs.docbook fish.docbook ftp.docbook rlogin.docbook info.docbook webdavs.docbook rlan.docbook mac.docbook cgi.docbook bzip.docbook data.docbook lan.docbook finger.docbook man.docbook news.docbook sftp.docbook file.docbook smb.docbook smtp.docbook bzip2.docbook imap.docbook tar.docbook help.docbook telnet.docbook print.docbook ; do \
-+	for file in floppy.docbook gzip.docbook webdav.docbook rlan.docbook lan.docbook https.docbook mailto.docbook file.docbook bzip.docbook pop3s.docbook info.docbook webdavs.docbook print.docbook index.docbook telnet.docbook http.docbook nntp.docbook ldap.docbook rlogin.docbook data.docbook mac.docbook ftp.docbook finger.docbook imap.docbook bzip2.docbook tar.docbook mrml.docbook imaps.docbook nfs.docbook fish.docbook pop3.docbook help.docbook smb.docbook news.docbook gopher.docbook smtp.docbook sftp.docbook man.docbook cgi.docbook thumbnail.docbook ; do \
++	for file in file.docbook nntp.docbook man.docbook print.docbook gzip.docbook sftp.docbook finger.docbook info.docbook webdav.docbook webdavs.docbook floppy.docbook smtp.docbook bzip2.docbook rlogin.docbook lan.docbook cgi.docbook pop3.docbook telnet.docbook rlan.docbook https.docbook mailto.docbook tar.docbook mrml.docbook fish.docbook smb.docbook imaps.docbook bzip.docbook ldap.docbook http.docbook help.docbook data.docbook gopher.docbook news.docbook mac.docbook pop3s.docbook index.docbook imap.docbook ftp.docbook thumbnail.docbook nfs.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -53817,7 +70915,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53827,7 +70933,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -53835,7 +70941,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -53848,7 +70954,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -53862,7 +70968,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -53870,7 +70976,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -53878,7 +70984,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -53891,7 +70997,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -53900,7 +71006,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -53912,39 +71018,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +741,7 @@
- KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png index.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper
--	@for base in screenshot.png index.docbook ; do \
-+	@for base in index.docbook screenshot.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in screenshot.png index.docbook ; do \
-+	for base in index.docbook screenshot.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/klipper/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in screenshot.png index.docbook ; do \
-+	for file in index.docbook screenshot.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kmenuedit/Makefile.in
 +++ doc/kmenuedit/Makefile.in
 @@ -107,6 +107,7 @@
@@ -53955,7 +71028,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53965,7 +71046,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -53973,7 +71054,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -53986,7 +71067,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -54000,7 +71081,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -54008,7 +71089,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -54016,7 +71097,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -54029,7 +71110,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54038,7 +71119,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54050,28 +71131,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +741,7 @@
+@@ -732,7 +740,7 @@
  KDE_DIST=done.png new.png index.docbook selectinternet.png itemname.png Makefile.in kmenueditmain.png selecticon.png Makefile.am index.cache.bz2 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) done.png itemname.png index.docbook selecticon.png selectinternet.png kmenueditmain.png new.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
+@@ -759,20 +767,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit
 -	@for base in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
-+	@for base in done.png itemname.png index.docbook selecticon.png selectinternet.png kmenueditmain.png new.png ; do \
++	@for base in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
-+	for base in done.png itemname.png index.docbook selecticon.png selectinternet.png kmenueditmain.png new.png ; do \
++	for base in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit/$$base ;\
  	done
  
@@ -54079,7 +71160,7 @@
  #>+ 5
  distdir-nls:
 -	for file in index.docbook itemname.png done.png selectinternet.png selecticon.png new.png kmenueditmain.png ; do \
-+	for file in done.png itemname.png index.docbook selecticon.png selectinternet.png kmenueditmain.png new.png ; do \
++	for file in selecticon.png done.png itemname.png kmenueditmain.png new.png selectinternet.png index.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -54093,7 +71174,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54103,7 +71192,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54111,7 +71200,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -54124,7 +71213,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -54138,7 +71227,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -54146,7 +71235,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -54154,7 +71243,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -54167,7 +71256,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54176,7 +71265,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54188,39 +71277,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +741,7 @@
- KDE_DIST=screenshot.png screenshot4.png screenshot3.png index.docbook screenshot2.png Makefile.in Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png screenshot2.png screenshot3.png screenshot4.png index.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot2.png screenshot3.png index.docbook screenshot.png screenshot4.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach
--	@for base in screenshot.png screenshot2.png screenshot3.png screenshot4.png index.docbook ; do \
-+	@for base in screenshot2.png screenshot3.png index.docbook screenshot.png screenshot4.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in screenshot.png screenshot2.png screenshot3.png screenshot4.png index.docbook ; do \
-+	for base in screenshot2.png screenshot3.png index.docbook screenshot.png screenshot4.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knetattach/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in screenshot.png screenshot2.png screenshot3.png screenshot4.png index.docbook ; do \
-+	for file in screenshot2.png screenshot3.png index.docbook screenshot.png screenshot4.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kompmgr/Makefile.in
 +++ doc/kompmgr/Makefile.in
 @@ -107,6 +107,7 @@
@@ -54231,7 +71287,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54241,7 +71305,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54249,7 +71313,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -54262,7 +71326,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -54276,7 +71340,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -54284,7 +71348,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -54292,7 +71356,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -54305,7 +71369,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54314,7 +71378,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54336,7 +71400,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54346,7 +71418,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54354,7 +71426,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -54367,7 +71439,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -54381,7 +71453,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -54389,7 +71461,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -54397,7 +71469,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -54410,7 +71482,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -545,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54419,7 +71491,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -583,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54431,28 +71503,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -733,7 +742,7 @@
- KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook bookmarks.docbook dragdrop.png basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png man-kbookmarkmerger.1.docbook introduction.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am index.cache.bz2 filemanager.docbook 
+@@ -730,10 +738,10 @@
+ .NOEXPORT:
  
+ #>+ 2
+-KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook bookmarks.docbook dragdrop.png basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png man-kbookmarkmerger.1.docbook introduction.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am index.cache.bz2 filemanager.docbook 
++KDE_DIST=shortcut2.png dirtree.png path-complete.docbook plugins.docbook konqorg.png save-settings.docbook index.docbook bookmarks.docbook dragdrop.png basics.docbook shortcut1.png browser.docbook Makefile.in credits.docbook parts.png introduction.docbook man-kbookmarkmerger.1.docbook faq.docbook commands.docbook sidebar.docbook config.docbook cmndline.png Makefile.am filemanager.docbook index.cache.bz2 
+ 
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) path-complete.docbook parts.png cmndline.png dragdrop.png filemanager.docbook save-settings.docbook faq.docbook browser.docbook sidebar.docbook index.docbook bookmarks.docbook introduction.docbook shortcut2.png plugins.docbook commands.docbook basics.docbook shortcut1.png dirtree.png config.docbook man-kbookmarkmerger.1.docbook credits.docbook konqorg.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -760,20 +769,20 @@
+@@ -760,20 +768,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror
 -	@for base in filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; do \
-+	@for base in path-complete.docbook parts.png cmndline.png dragdrop.png filemanager.docbook save-settings.docbook faq.docbook browser.docbook sidebar.docbook index.docbook bookmarks.docbook introduction.docbook shortcut2.png plugins.docbook commands.docbook basics.docbook shortcut1.png dirtree.png config.docbook man-kbookmarkmerger.1.docbook credits.docbook konqorg.png ; do \
++	@for base in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; do \
-+	for base in path-complete.docbook parts.png cmndline.png dragdrop.png filemanager.docbook save-settings.docbook faq.docbook browser.docbook sidebar.docbook index.docbook bookmarks.docbook introduction.docbook shortcut2.png plugins.docbook commands.docbook basics.docbook shortcut1.png dirtree.png config.docbook man-kbookmarkmerger.1.docbook credits.docbook konqorg.png ; do \
++	for base in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror/$$base ;\
  	done
  
@@ -54460,7 +71536,7 @@
  #>+ 5
  distdir-nls:
 -	for file in filemanager.docbook shortcut1.png commands.docbook shortcut2.png dirtree.png basics.docbook path-complete.docbook config.docbook dragdrop.png index.docbook faq.docbook sidebar.docbook save-settings.docbook introduction.docbook plugins.docbook browser.docbook konqorg.png bookmarks.docbook credits.docbook man-kbookmarkmerger.1.docbook cmndline.png parts.png ; do \
-+	for file in path-complete.docbook parts.png cmndline.png dragdrop.png filemanager.docbook save-settings.docbook faq.docbook browser.docbook sidebar.docbook index.docbook bookmarks.docbook introduction.docbook shortcut2.png plugins.docbook commands.docbook basics.docbook shortcut1.png dirtree.png config.docbook man-kbookmarkmerger.1.docbook credits.docbook konqorg.png ; do \
++	for file in dirtree.png sidebar.docbook man-kbookmarkmerger.1.docbook parts.png plugins.docbook konqorg.png introduction.docbook shortcut1.png shortcut2.png config.docbook dragdrop.png commands.docbook cmndline.png browser.docbook faq.docbook basics.docbook bookmarks.docbook path-complete.docbook filemanager.docbook index.docbook save-settings.docbook credits.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -54474,7 +71550,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54484,7 +71568,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54492,7 +71576,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -54505,7 +71589,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -54519,7 +71603,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -54527,7 +71611,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -54535,7 +71619,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -54548,7 +71632,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54557,7 +71641,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54569,6 +71653,39 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -732,7 +740,7 @@
+ KDE_DIST=index.docbook Makefile.in tabbar.png konsole.png Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook konsole.png tabbar.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) konsole.png index.docbook tabbar.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -759,20 +767,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole
+-	@for base in index.docbook konsole.png tabbar.png ; do \
++	@for base in konsole.png index.docbook tabbar.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook konsole.png tabbar.png ; do \
++	for base in konsole.png index.docbook tabbar.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook konsole.png tabbar.png ; do \
++	for file in konsole.png index.docbook tabbar.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
 --- doc/kpager/Makefile.in
 +++ doc/kpager/Makefile.in
 @@ -107,6 +107,7 @@
@@ -54579,7 +71696,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54589,7 +71714,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54597,7 +71722,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -54610,7 +71735,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -54624,7 +71749,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -54632,7 +71757,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -54640,7 +71765,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -54653,7 +71778,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54662,7 +71787,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54674,39 +71799,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +741,7 @@
- KDE_DIST=screenshot.png index.docbook Makefile.in settings.png Makefile.am index.cache.bz2 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png settings.png index.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) settings.png index.docbook screenshot.png 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager
--	@for base in screenshot.png settings.png index.docbook ; do \
-+	@for base in settings.png index.docbook screenshot.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in screenshot.png settings.png index.docbook ; do \
-+	for base in settings.png index.docbook screenshot.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kpager/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in screenshot.png settings.png index.docbook ; do \
-+	for file in settings.png index.docbook screenshot.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/ksplashml/Makefile.in
 +++ doc/ksplashml/Makefile.in
 @@ -107,6 +107,7 @@
@@ -54717,7 +71809,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54727,7 +71827,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54735,7 +71835,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -54748,7 +71848,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -54762,7 +71862,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -54770,7 +71870,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -54778,7 +71878,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -54791,7 +71891,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54800,7 +71900,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54822,7 +71922,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54832,7 +71940,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54840,7 +71948,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -54853,7 +71961,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -54867,7 +71975,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -54875,7 +71983,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -54883,7 +71991,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -54896,7 +72004,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -54905,7 +72013,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -54927,7 +72035,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54937,7 +72053,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -54945,7 +72061,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -54958,7 +72074,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -54972,7 +72088,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -54980,7 +72096,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -54988,7 +72104,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -55001,7 +72117,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -55010,7 +72126,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55032,7 +72148,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55042,7 +72166,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55050,7 +72174,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -55063,7 +72187,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -55077,7 +72201,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -55085,7 +72209,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -55093,7 +72217,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -55106,7 +72230,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -55115,7 +72239,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55127,7 +72251,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +738,10 @@
+@@ -729,10 +737,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -55136,23 +72260,23 @@
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook layout.png switching.png xkb.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook layout.png xkb.png switching.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) xkb.png layout.png index.docbook switching.png 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
+@@ -759,20 +767,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb
 -	@for base in index.docbook layout.png switching.png xkb.png ; do \
-+	@for base in index.docbook layout.png xkb.png switching.png ; do \
++	@for base in xkb.png layout.png index.docbook switching.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in index.docbook layout.png switching.png xkb.png ; do \
-+	for base in index.docbook layout.png xkb.png switching.png ; do \
++	for base in xkb.png layout.png index.docbook switching.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kxkb/$$base ;\
  	done
  
@@ -55160,7 +72284,7 @@
  #>+ 5
  distdir-nls:
 -	for file in index.docbook layout.png switching.png xkb.png ; do \
-+	for file in index.docbook layout.png xkb.png switching.png ; do \
++	for file in xkb.png layout.png index.docbook switching.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -55174,7 +72298,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55184,7 +72316,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55192,7 +72324,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -55205,7 +72337,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -55219,7 +72351,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -55227,7 +72359,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -55235,7 +72367,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -55248,12 +72380,12 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -557,13 +566,13 @@
+@@ -557,13 +565,13 @@
  KDE_DOCS = AUTO
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
 -SUBDIRS =. kdeprint kdebugdialog kappfinder kate kmenuedit konqueror knetattach quickstart kfind kcontrol userguide ksplashml kxkb kdcop glossary khelpcenter kwrite klipper kinfocenter faq visualdict kicker kpager konsole kdm kdesu kompmgr ksysguard kioslave
-+SUBDIRS =. kpager kxkb userguide kappfinder faq konqueror kicker ksysguard konsole kate kompmgr khelpcenter kioslave kinfocenter kdebugdialog visualdict kwrite quickstart ksplashml kdesu kdm knetattach kcontrol kdcop klipper kdeprint kfind glossary kmenuedit
++SUBDIRS =. faq kdm kate kxkb ksysguard quickstart kdcop kdesu kfind klipper kappfinder kompmgr konsole khelpcenter kmenuedit kioslave knetattach glossary kcontrol kdeprint kicker kpager kwrite ksplashml kdebugdialog kinfocenter userguide konqueror visualdict
  #>- all: all-recursive
  #>+ 1
  all: docs-am  all-recursive
@@ -55264,7 +72396,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +610,9 @@
+@@ -601,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55286,7 +72418,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55296,7 +72436,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55304,7 +72444,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -55317,7 +72457,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -55331,7 +72471,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -55339,7 +72479,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -55347,7 +72487,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -55360,7 +72500,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -55369,7 +72509,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55391,7 +72531,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55401,7 +72549,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55409,7 +72557,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -55422,7 +72570,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -55436,7 +72584,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -55444,7 +72592,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -55452,7 +72600,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -55465,7 +72613,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -55474,7 +72622,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55486,32 +72634,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,10 +738,10 @@
+@@ -729,10 +737,10 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook knode-mail-account.png programs-controlling.docbook kcontrol.png kaboodle-icon.png a-window.png pdf-files.docbook juk-icon.png amarok-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png oggfolder.png removable-disks.docbook getting-help.docbook noatun.png kmouth2.png knode-news-account.png font-installation.docbook extragear-applications.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png playing-movies.docbook file-sharing.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png kde-for-admins.docbook usenet.docbook kmouth.png juk.png net-connection-setup.docbook kmag.png groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook migrator-applications.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
-+KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook knode-mail-account.png programs-controlling.docbook kcontrol.png kaboodle-icon.png pdf-files.docbook a-window.png juk-icon.png amarok-icon.png kde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook amarok.png where-next.docbook removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png knode-news-account.png extragear-applications.docbook font-installation.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook knode-identity.png knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png net-connection-setup.docbook kmag.png groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
++KDE_DIST=kde-as-root.docbook rip.png konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png kaboodle-icon.png pdf-files.docbook a-window.png amarok-icon.png juk-icon.png kde-edutainment.docbook index.docbook the-filemanager.docbook open-file-dialog.png services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook amarok.png where-next.docbook removable-disks.docbook oggfolder.png getting-help.docbook noatun.png knode-news-account.png kmouth2.png extragear-applications.docbook font-installation.docbook screen-captures.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook knode-start.png desktop.png playing-audiocds.docbook index.cache.bz2 kaboodle.png file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png kde-for-admins.docbook usenet.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook kppp-dialer-tab.png printer-setup.docbook under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook migrator-applications.docbook kopete.png konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
  
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kaboodle-icon.png where-next.docbook under-the-hood.docbook glossary.docbook migrator-applications.docbook your-kde-account.docbook the-filemanager.docbook programs-controlling.docbook oggfolder.png knode-mail-account.png removable-disks.docbook shared-sessions.docbook burning-cds.docbook konq-sidebar.png kmouth.png troubleshooting-no-open.docbook noatun.png internet-shortcuts.docbook switching-sessions.docbook kppp-wizard.png amarok-icon.png kde-for-admins.docbook browser-fine-tuning.docbook knode-start.png control-center.docbook net-connection-setup.docbook screen-captures.docbook kmousetool.png kppp-dialer-tab.png knode-identity.png networking-with-windows.docbook a-window.png ripsettings.png font-installation.docbook creating-graphics.docbook index.docbook kcontrol.png playing-audiocds.docbook titlebar-menu.png rip.png juk.png open-file-dialog.png playing-music.docbook kmouth3.png printing-from-apps.docbook knode-news-account.png konq-simple.png kde-edutainment.docbook juk-icon.png kmouth2.png messaging-intro.docbook email.docbook konsole-intro.docbook kcalc-systray.png panel-and-desktop.docbook desktop.png kde-as-root.docbook services.png migrator-dictionary.docbook base-kde-applications.docbook kmag.png file-sharing.docbook windows-how-to.docbook playing-movies.docbook kaboodle.png usenet.docbook accessibility.docbook troubleshooting-network-x.docbook extragear-applications.docbook credits-and-license.docbook printer-setup.docbook standard-menu-entries.docbook pdf-files.docbook kopete.png programs-and-documents.docbook groupware-kontact.docbook noatun-icon.png amarok.png kde-office.docbook getting-help.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
+@@ -759,20 +767,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
 -	@for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
-+	@for base in kaboodle-icon.png where-next.docbook under-the-hood.docbook glossary.docbook migrator-applications.docbook your-kde-account.docbook the-filemanager.docbook programs-controlling.docbook oggfolder.png knode-mail-account.png removable-disks.docbook shared-sessions.docbook burning-cds.docbook konq-sidebar.png kmouth.png troubleshooting-no-open.docbook noatun.png internet-shortcuts.docbook switching-sessions.docbook kppp-wizard.png amarok-icon.png kde-for-admins.docbook browser-fine-tuning.docbook knode-start.png control-center.docbook net-connection-setup.docbook screen-captures.docbook kmousetool.png kppp-dialer-tab.png knode-identity.png networking-with-windows.docbook a-window.png ripsettings.png font-installation.docbook creating-graphics.docbook index.docbook kcontrol.png playing-audiocds.docbook titlebar-menu.png rip.png juk.png open-file-dialog.png playing-music.docbook kmouth3.png printing-from-apps.docbook knode-news-account.png konq-simple.png kde-edutainment.docbook juk-icon.png kmouth2.png messaging-intro.docbook email.docbook konsole-intro.docbook kcalc-systray.png panel-and-desktop.docbook desktop.png kde-as-root.docbook services.png migrator-dictionary.docbook base-kde-applications.docbook kmag.png file-sharing.docbook windows-how-to.docbook playing-movies.docbook kaboodle.png usenet.docbook accessibility.docbook troubleshooting-network-x.docbook extragear-applications.docbook credits-and-license.docbook printer-setup.docbook standard-menu-entries.docbook pdf-files.docbook kopete.png programs-and-documents.docbook groupware-kontact.docbook noatun-icon.png amarok.png kde-office.docbook getting-help.docbook ; do \
++	@for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
-+	for base in kaboodle-icon.png where-next.docbook under-the-hood.docbook glossary.docbook migrator-applications.docbook your-kde-account.docbook the-filemanager.docbook programs-controlling.docbook oggfolder.png knode-mail-account.png removable-disks.docbook shared-sessions.docbook burning-cds.docbook konq-sidebar.png kmouth.png troubleshooting-no-open.docbook noatun.png internet-shortcuts.docbook switching-sessions.docbook kppp-wizard.png amarok-icon.png kde-for-admins.docbook browser-fine-tuning.docbook knode-start.png control-center.docbook net-connection-setup.docbook screen-captures.docbook kmousetool.png kppp-dialer-tab.png knode-identity.png networking-with-windows.docbook a-window.png ripsettings.png font-installation.docbook creating-graphics.docbook index.docbook kcontrol.png playing-audiocds.docbook titlebar-menu.png rip.png juk.png open-file-dialog.png playing-music.docbook kmouth3.png printing-from-apps.docbook knode-news-account.png konq-simple.png kde-edutainment.docbook juk-icon.png kmouth2.png messaging-intro.docbook email.docbook konsole-intro.docbook kcalc-systray.png panel-and-desktop.docbook desktop.png kde-as-root.docbook services.png migrator-dictionary.docbook base-kde-applications.docbook kmag.png file-sharing.docbook windows-how-to.docbook playing-movies.docbook kaboodle.png usenet.docbook accessibility.docbook troubleshooting-network-x.docbook extragear-applications.docbook credits-and-license.docbook printer-setup.docbook standard-menu-entries.docbook pdf-files.docbook kopete.png programs-and-documents.docbook groupware-kontact.docbook noatun-icon.png amarok.png kde-office.docbook getting-help.docbook ; do \
++	for base in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
  	done
  
@@ -55519,7 +72667,7 @@
  #>+ 5
  distdir-nls:
 -	for file in konq-sidebar.png desktop.png troubleshooting-no-open.docbook screen-captures.docbook switching-sessions.docbook amarok-icon.png kmousetool.png panel-and-desktop.docbook index.docbook migrator-applications.docbook shared-sessions.docbook kppp-wizard.png net-connection-setup.docbook playing-music.docbook kopete.png kmag.png extragear-applications.docbook internet-shortcuts.docbook creating-graphics.docbook kde-office.docbook control-center.docbook kde-for-admins.docbook playing-movies.docbook glossary.docbook kde-edutainment.docbook file-sharing.docbook pdf-files.docbook titlebar-menu.png juk.png standard-menu-entries.docbook printer-setup.docbook open-file-dialog.png kppp-dialer-tab.png networking-with-windows.docbook programs-controlling.docbook migrator-dictionary.docbook getting-help.docbook services.png noatun-icon.png a-window.png base-kde-applications.docbook printing-from-apps.docbook knode-start.png browser-fine-tuning.docbook konsole-intro.docbook usenet.docbook email.docbook noatun.png kmouth.png amarok.png juk-icon.png credits-and-license.docbook rip.png kaboodle.png under-the-hood.docbook kde-as-root.docbook removable-disks.docbook accessibility.docbook your-kde-account.docbook playing-audiocds.docbook kaboodle-icon.png konq-simple.png programs-and-documents.docbook font-installation.docbook windows-how-to.docbook messaging-intro.docbook burning-cds.docbook oggfolder.png groupware-kontact.docbook knode-mail-account.png ripsettings.png where-next.docbook troubleshooting-network-x.docbook the-filemanager.docbook knode-news-account.png knode-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; do \
-+	for file in kaboodle-icon.png where-next.docbook under-the-hood.docbook glossary.docbook migrator-applications.docbook your-kde-account.docbook the-filemanager.docbook programs-controlling.docbook oggfolder.png knode-mail-account.png removable-disks.docbook shared-sessions.docbook burning-cds.docbook konq-sidebar.png kmouth.png troubleshooting-no-open.docbook noatun.png internet-shortcuts.docbook switching-sessions.docbook kppp-wizard.png amarok-icon.png kde-for-admins.docbook browser-fine-tuning.docbook knode-start.png control-center.docbook net-connection-setup.docbook screen-captures.docbook kmousetool.png kppp-dialer-tab.png knode-identity.png networking-with-windows.docbook a-window.png ripsettings.png font-installation.docbook creating-graphics.docbook index.docbook kcontrol.png playing-audiocds.docbook titlebar-menu.png rip.png juk.png open-file-dialog.png playing-music.docbook kmouth3.png printing-from-apps.docbook knode-news-account.png konq-simple.png kde-edutainment.docbook juk-icon.png kmouth2.png messaging-intro.docbook email.docbook konsole-intro.docbook kcalc-systray.png panel-and-desktop.docbook desktop.png kde-as-root.docbook services.png migrator-dictionary.docbook base-kde-applications.docbook kmag.png file-sharing.docbook windows-how-to.docbook playing-movies.docbook kaboodle.png usenet.docbook accessibility.docbook troubleshooting-network-x.docbook extragear-applications.docbook credits-and-license.docbook printer-setup.docbook standard-menu-entries.docbook pdf-files.docbook kopete.png programs-and-documents.docbook groupware-kontact.docbook noatun-icon.png amarok.png kde-office.docbook getting-help.docbook ; do \
++	for file in internet-shortcuts.docbook kaboodle.png playing-audiocds.docbook migrator-dictionary.docbook knode-mail-account.png kde-office.docbook kmousetool.png your-kde-account.docbook open-file-dialog.png switching-sessions.docbook creating-graphics.docbook programs-controlling.docbook juk.png oggfolder.png accessibility.docbook standard-menu-entries.docbook rip.png kaboodle-icon.png kmouth.png juk-icon.png file-sharing.docbook panel-and-desktop.docbook kmouth2.png kmouth3.png where-next.docbook noatun-icon.png migrator-applications.docbook kcalc-systray.png knode-news-account.png credits-and-license.docbook konq-simple.png kcontrol.png kppp-dialer-tab.png shared-sessions.docbook troubleshooting-no-open.docbook screen-captures.docbook a-window.png amarok-icon.png konq-sidebar.png titlebar-menu.png font-installation.docbook pdf-files.docbook messaging-intro.docbook the-filemanager.docbook desktop.png playing-movies.docbook printer-setup.docbook kde-edutainment.docbook noatun.png base-kde-applications.docbook kde-as-root.docbook windows-how-to.docbook email.docbook services.png net-connection-setup.docbook kopete.png usenet.docbook removable-disks.docbook knode-identity.png printing-from-apps.docbook browser-fine-tuning.docbook kde-for-admins.docbook kmag.png networking-with-windows.docbook extragear-applications.docbook knode-start.png glossary.docbook programs-and-documents.docbook amarok.png under-the-hood.docbook index.docbook kppp-wizard.png troubleshooting-network-x.docbook konsole-intro.docbook groupware-kontact.docbook control-center.docbook playing-music.docbook burning-cds.docbook ripsettings.png getting-help.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -55533,7 +72681,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55543,7 +72699,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55551,7 +72707,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -55564,7 +72720,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -55578,7 +72734,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -55586,7 +72742,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -55594,7 +72750,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -55607,7 +72763,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -55616,7 +72772,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55628,28 +72784,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,7 +741,7 @@
- KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict3.png pict13.png contextmenu.png Makefile.am 
+@@ -729,10 +737,10 @@
+ .NOEXPORT:
  
+ #>+ 2
+-KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict3.png pict13.png contextmenu.png Makefile.am 
++KDE_DIST=pict10.png pict7.png index.docbook pict1.png pict11.png pict17.png pict18.png pict19.png index.cache.bz2 pict2.png pict6.png pict8.png pict14.png pict12.png pict16.png pict20.png pict5.png pict9.png Makefile.in pict15.png pict4.png pict13.png pict3.png contextmenu.png Makefile.am 
+ 
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) pict17.png pict12.png contextmenu.png pict4.png pict15.png pict13.png pict20.png pict10.png pict18.png pict9.png index.docbook pict6.png pict1.png pict2.png pict11.png pict3.png pict14.png pict7.png pict5.png pict16.png pict8.png pict19.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -759,20 +768,20 @@
+@@ -759,20 +767,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict
 -	@for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+	@for base in pict17.png pict12.png contextmenu.png pict4.png pict15.png pict13.png pict20.png pict10.png pict18.png pict9.png index.docbook pict6.png pict1.png pict2.png pict11.png pict3.png pict14.png pict7.png pict5.png pict16.png pict8.png pict19.png ; do \
++	@for base in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+	for base in pict17.png pict12.png contextmenu.png pict4.png pict15.png pict13.png pict20.png pict10.png pict18.png pict9.png index.docbook pict6.png pict1.png pict2.png pict11.png pict3.png pict14.png pict7.png pict5.png pict16.png pict8.png pict19.png ; do \
++	for base in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict/$$base ;\
  	done
  
@@ -55657,7 +72817,7 @@
  #>+ 5
  distdir-nls:
 -	for file in index.docbook pict10.png pict20.png pict11.png pict12.png pict13.png contextmenu.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png ; do \
-+	for file in pict17.png pict12.png contextmenu.png pict4.png pict15.png pict13.png pict20.png pict10.png pict18.png pict9.png index.docbook pict6.png pict1.png pict2.png pict11.png pict3.png pict14.png pict7.png pict5.png pict16.png pict8.png pict19.png ; do \
++	for file in pict20.png contextmenu.png pict1.png pict2.png pict3.png pict4.png pict5.png pict6.png pict7.png pict8.png pict9.png index.docbook pict10.png pict11.png pict12.png pict13.png pict14.png pict15.png pict16.png pict17.png pict18.png pict19.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -55671,7 +72831,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55681,7 +72849,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55689,7 +72857,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -55702,7 +72870,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -55716,7 +72884,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -55724,7 +72892,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -55732,7 +72900,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -55745,7 +72913,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -55754,7 +72922,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55776,7 +72944,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -315,6 +316,9 @@
+@@ -265,7 +266,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -315,6 +315,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55786,7 +72962,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -365,6 +369,7 @@
+@@ -365,6 +368,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55794,7 +72970,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -372,12 +377,9 @@
+@@ -372,12 +376,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -55807,7 +72983,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -398,10 +400,13 @@
+@@ -398,10 +399,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -55821,7 +72997,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -410,6 +415,7 @@
+@@ -410,6 +414,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -55829,7 +73005,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -571,6 +577,7 @@
+@@ -571,6 +576,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -55837,7 +73013,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -578,10 +585,12 @@
+@@ -578,10 +584,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -55850,7 +73026,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -623,7 +632,7 @@
+@@ -623,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -55859,7 +73035,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +670,9 @@
+@@ -661,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -55871,52 +73047,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1040,6 +1049,13 @@
- .NOEXPORT:
- 
- #>+ 3
-+toplevel.moc: $(srcdir)/toplevel.h
-+	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
-+
-+#>+ 2
-+mocs: toplevel.moc
-+
-+#>+ 3
- debugger.moc: $(srcdir)/debugger.h
- 	$(MOC) $(srcdir)/debugger.h -o debugger.moc
- 
-@@ -1054,13 +1070,6 @@
- mocs: backtrace.moc
- 
- #>+ 3
--toplevel.moc: $(srcdir)/toplevel.h
--	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
--
--#>+ 2
--mocs: toplevel.moc
--
--#>+ 3
- drbugreport.moc: $(srcdir)/drbugreport.h
- 	$(MOC) $(srcdir)/drbugreport.h -o drbugreport.moc
- 
-@@ -1082,7 +1091,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  debugger.moc backtrace.moc toplevel.moc drbugreport.moc krashconf.moc
-+	-rm -f  toplevel.moc debugger.moc backtrace.moc drbugreport.moc krashconf.moc
- 
- #>+ 2
- KDE_DIST=backtrace.h toplevel.h drbugreport.h Makefile.in krashdcopinterface.h krashconf.h debugger.h Makefile.am 
-@@ -1134,7 +1143,7 @@
- 
- 
- #>+ 11
--drkonqi.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/debugger.cpp $(srcdir)/krashconf.cpp $(srcdir)/drbugreport.cpp $(srcdir)/backtrace.cpp $(srcdir)/toplevel.cpp krashdcopinterface_skel.cpp  toplevel.moc backtrace.moc debugger.moc drbugreport.moc krashconf.moc
-+drkonqi.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/debugger.cpp $(srcdir)/krashconf.cpp $(srcdir)/drbugreport.cpp $(srcdir)/backtrace.cpp $(srcdir)/toplevel.cpp krashdcopinterface_skel.cpp  backtrace.moc debugger.moc toplevel.moc drbugreport.moc krashconf.moc
- 	@echo 'creating drkonqi.all_cpp.cpp ...'; \
- 	rm -f drkonqi.all_cpp.files drkonqi.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> drkonqi.all_cpp.final; \
 --- drkonqi/pics/Makefile.in
 +++ drkonqi/pics/Makefile.in
 @@ -117,6 +117,7 @@
@@ -55927,7 +73057,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55937,7 +73075,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -55945,7 +73083,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -55958,7 +73096,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -55972,7 +73110,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -55980,7 +73118,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -55988,7 +73126,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -56001,7 +73139,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -56010,7 +73148,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56032,7 +73170,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56042,7 +73188,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56050,7 +73196,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -56063,7 +73209,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -56077,7 +73223,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -56085,7 +73231,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -56093,7 +73239,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -56106,7 +73252,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -56115,7 +73261,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56137,7 +73283,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56147,7 +73301,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56155,7 +73309,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -56168,7 +73322,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -56182,7 +73336,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -56190,7 +73344,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -56198,7 +73352,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -56211,7 +73365,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -557,7 +566,7 @@
+@@ -557,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -56220,7 +73374,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +604,9 @@
+@@ -595,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56242,7 +73396,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56252,7 +73414,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56260,7 +73422,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -56273,7 +73435,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -56287,7 +73449,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -56295,7 +73457,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -56303,7 +73465,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -56316,7 +73478,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -56325,7 +73487,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56347,7 +73509,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56357,7 +73527,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56365,7 +73535,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -56378,7 +73548,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -56392,7 +73562,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -56400,7 +73570,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -56408,7 +73578,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -56421,7 +73591,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -56430,7 +73600,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56442,15 +73612,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -760,7 +769,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Glines.desktop Gataxx.desktop xboard.desktop Gmines.desktop Gmahjongg.desktop Gnotravex.desktop Iagno.desktop Xgammon.desktop Gchess.desktop SameGnome.desktop Gstones.desktop Makefile.in Gnotski.desktop Makefile.am 
-+KDE_DIST=Glines.desktop Gataxx.desktop xboard.desktop Gmahjongg.desktop Gmines.desktop Gnotravex.desktop Iagno.desktop Xgammon.desktop Gchess.desktop SameGnome.desktop Gstones.desktop Makefile.in Gnotski.desktop Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kappfinder/apps/Games/Card/Makefile.in
 +++ kappfinder/apps/Games/Card/Makefile.in
 @@ -117,6 +117,7 @@
@@ -56461,7 +73622,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56471,7 +73640,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56479,7 +73648,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -56492,7 +73661,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -56506,7 +73675,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -56514,7 +73683,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -56522,7 +73691,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -56535,7 +73704,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -56544,7 +73713,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56566,7 +73735,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56576,7 +73753,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56584,7 +73761,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -56597,7 +73774,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -56611,7 +73788,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -56619,7 +73796,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -56627,7 +73804,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -56640,7 +73817,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -56649,7 +73826,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56671,7 +73848,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -277,6 +278,9 @@
+@@ -227,7 +228,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56681,7 +73866,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,6 +331,7 @@
+@@ -327,6 +330,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56689,7 +73874,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -334,12 +339,9 @@
+@@ -334,12 +338,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -56702,7 +73887,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,10 +362,13 @@
+@@ -360,10 +361,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -56716,7 +73901,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -372,6 +377,7 @@
+@@ -372,6 +376,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -56724,7 +73909,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -533,6 +539,7 @@
+@@ -533,6 +538,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -56732,7 +73917,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -540,10 +547,12 @@
+@@ -540,10 +546,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -56745,7 +73930,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -574,7 +583,7 @@
+@@ -574,7 +582,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -56754,7 +73939,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +621,9 @@
+@@ -612,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56776,7 +73961,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56786,7 +73979,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56794,7 +73987,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -56807,7 +74000,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -56821,7 +74014,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -56829,7 +74022,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -56837,7 +74030,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -56850,7 +74043,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -557,7 +566,7 @@
+@@ -557,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -56859,7 +74052,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +604,9 @@
+@@ -595,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56881,7 +74074,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56891,7 +74092,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -56899,7 +74100,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -56912,7 +74113,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -56926,7 +74127,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -56934,7 +74135,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -56942,7 +74143,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -56955,7 +74156,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -56964,7 +74165,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -56986,7 +74187,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56996,7 +74205,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57004,7 +74213,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -57017,7 +74226,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -57031,7 +74240,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -57039,7 +74248,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -57047,7 +74256,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -57060,7 +74269,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -57069,7 +74278,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57091,7 +74300,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57101,7 +74318,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57109,7 +74326,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -57122,7 +74339,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -57136,7 +74353,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -57144,7 +74361,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -57152,7 +74369,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -57165,7 +74382,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -561,7 +570,7 @@
+@@ -561,7 +569,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -57174,7 +74391,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +608,9 @@
+@@ -599,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57186,15 +74403,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -761,7 +770,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=GnomeIconEditor.desktop GnomeColorSelector.desktop xdvi.desktop tgif.desktop xfig.desktop Sketch.desktop GPhoto.desktop gv.desktop xpaint.desktop gimp.desktop bitmap.desktop blender.desktop inkscape.desktop Xwpick.desktop Gqview.desktop Makefile.in Xpcd.desktop ElectricEyes.desktop ghostview.desktop Makefile.am xv.desktop sodipodi.desktop 
-+KDE_DIST=GnomeIconEditor.desktop GnomeColorSelector.desktop xdvi.desktop tgif.desktop xfig.desktop Sketch.desktop GPhoto.desktop gv.desktop xpaint.desktop gimp.desktop bitmap.desktop blender.desktop inkscape.desktop Xwpick.desktop Gqview.desktop Makefile.in Xpcd.desktop ElectricEyes.desktop ghostview.desktop Makefile.am sodipodi.desktop xv.desktop 
- 
- #>+ 2
- docs-am:
 --- kappfinder/apps/Internet/Makefile.in
 +++ kappfinder/apps/Internet/Makefile.in
 @@ -133,6 +133,7 @@
@@ -57205,7 +74413,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -277,6 +278,9 @@
+@@ -227,7 +228,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57215,7 +74431,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,6 +331,7 @@
+@@ -327,6 +330,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57223,7 +74439,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -334,12 +339,9 @@
+@@ -334,12 +338,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -57236,7 +74452,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,10 +362,13 @@
+@@ -360,10 +361,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -57250,7 +74466,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -372,6 +377,7 @@
+@@ -372,6 +376,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -57258,7 +74474,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -533,6 +539,7 @@
+@@ -533,6 +538,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -57266,7 +74482,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -540,10 +547,12 @@
+@@ -540,10 +546,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -57279,7 +74495,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -584,7 +593,7 @@
+@@ -584,7 +592,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -57288,7 +74504,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +631,9 @@
+@@ -622,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57300,12 +74516,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -933,7 +942,7 @@
+@@ -933,7 +941,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop javaws.desktop Gabber.desktop mozilla.desktop ickle.desktop gnometalk.desktop netscape6.desktop gtelnet.desktop xftp.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop Makefile.in btdownloadgui.desktop GnomeICU.desktop BlueFish.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop 
-+KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop javaws.desktop Gabber.desktop mozilla.desktop ickle.desktop gnometalk.desktop netscape6.desktop xftp.desktop gtelnet.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop gaim.desktop Sylpheed.desktop licq.desktop DrakSync.desktop netscape.desktop Makefile.in btdownloadgui.desktop GnomeICU.desktop BlueFish.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop 
++KDE_DIST=opera.desktop Nmapfe.desktop coolmail.desktop Pan.desktop ethereal.desktop balsa.desktop arena.desktop Evolution.desktop dc_gui.desktop mldonkey_gui.desktop mozilla-thunderbird.desktop xfmail.desktop Netscapemessenger.desktop mozilla-firefox.desktop javaws.desktop Gabber.desktop mozilla.desktop gnometalk.desktop ickle.desktop netscape6.desktop xftp.desktop gtelnet.desktop gFTP.desktop Faces.desktop gnomemeeting.desktop ed2k_gui.desktop Dpsftp.desktop knews.desktop epiphany.desktop gaim.desktop licq.desktop Sylpheed.desktop DrakSync.desktop netscape.desktop btdownloadgui.desktop Makefile.in BlueFish.desktop GnomeICU.desktop Fetchmailconf.desktop Galeon.desktop Makefile.am xchat.desktop xbiff.desktop 
  
  #>+ 2
  docs-am:
@@ -57319,7 +74535,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57329,7 +74553,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57337,7 +74561,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -57350,7 +74574,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -57364,7 +74588,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -57372,7 +74596,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -57380,7 +74604,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -57393,7 +74617,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -57402,7 +74626,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57424,7 +74648,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57434,7 +74666,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57442,7 +74674,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -57455,7 +74687,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -57469,7 +74701,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -57477,7 +74709,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -57485,7 +74717,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -57498,7 +74730,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -561,7 +570,7 @@
+@@ -561,7 +569,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -57507,7 +74739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +608,9 @@
+@@ -599,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57529,7 +74761,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57539,7 +74779,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57547,7 +74787,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -57560,7 +74800,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -57574,7 +74814,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -57582,7 +74822,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -57590,7 +74830,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -57603,7 +74843,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -581,7 +590,7 @@
+@@ -581,7 +589,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -57612,7 +74852,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +628,9 @@
+@@ -619,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57624,12 +74864,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -783,7 +792,7 @@
+@@ -783,7 +791,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=bcast2000.desktop XMovie.desktop xcam.desktop ogle.desktop alsamixergui.desktop slab.desktop alevt.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop Aumix.desktop xawtv.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am 
-+KDE_DIST=bcast2000.desktop XMovie.desktop xcam.desktop ogle.desktop alsamixergui.desktop alevt.desktop slab.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop Aumix.desktop xawtv.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am 
++KDE_DIST=XMovie.desktop bcast2000.desktop xcam.desktop ogle.desktop alsamixergui.desktop slab.desktop alevt.desktop rezound.desktop xine.desktop mtv.desktop audacity.desktop mplayer.desktop MP3info.desktop realplayer.desktop Grip.desktop gtv.desktop enjoympeg.desktop jazz.desktop Aumix.desktop xawtv.desktop xmms-enqueue.desktop Makefile.in oqtplayer.desktop aviplay.desktop sweep.desktop xmms.desktop Makefile.am 
  
  #>+ 2
  docs-am:
@@ -57643,7 +74883,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57653,7 +74901,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57661,7 +74909,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -57674,7 +74922,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -57688,7 +74936,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -57696,7 +74944,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -57704,7 +74952,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -57717,7 +74965,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -562,7 +571,7 @@
+@@ -562,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -57726,7 +74974,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +609,9 @@
+@@ -600,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57738,12 +74986,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -762,7 +771,7 @@
+@@ -762,7 +770,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop pybliographic.desktop gnucash.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop lyx.desktop acroread.desktop Makefile.in mrproject.desktop scribus.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop 
-+KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop gnucash.desktop pybliographic.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop lyx.desktop acroread.desktop Makefile.in mrproject.desktop scribus.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop 
++KDE_DIST=Applix.desktop Gnome-Card.desktop Ical.desktop Gnumeric.desktop WordPerfect.desktop Gnome-Cal.desktop netscapeaddressbook.desktop gnucash.desktop pybliographic.desktop xpdf.desktop GnomeTimeTracker.desktop abiword.desktop acroread.desktop lyx.desktop Makefile.in scribus.desktop mrproject.desktop plan.desktop XsLite.desktop WordPerfect2000.desktop XAcc.desktop Dia.desktop Makefile.am Guppi.desktop 
  
  #>+ 2
  docs-am:
@@ -57757,7 +75005,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -277,6 +278,9 @@
+@@ -227,7 +228,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57767,7 +75023,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,6 +331,7 @@
+@@ -327,6 +330,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57775,7 +75031,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -334,12 +339,9 @@
+@@ -334,12 +338,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -57788,7 +75044,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,10 +362,13 @@
+@@ -360,10 +361,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -57802,7 +75058,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -372,6 +377,7 @@
+@@ -372,6 +376,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -57810,7 +75066,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -533,6 +539,7 @@
+@@ -533,6 +538,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -57818,7 +75074,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -540,10 +547,12 @@
+@@ -540,10 +546,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -57831,7 +75087,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -574,7 +583,7 @@
+@@ -574,7 +582,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -57840,7 +75096,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +621,9 @@
+@@ -612,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57862,7 +75118,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57872,7 +75136,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57880,7 +75144,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -57893,7 +75157,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -57907,7 +75171,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -57915,7 +75179,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -57923,7 +75187,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -57936,7 +75200,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -57945,7 +75209,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -57967,7 +75231,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57977,7 +75249,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -57985,7 +75257,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -57998,7 +75270,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -58012,7 +75284,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -58020,7 +75292,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -58028,7 +75300,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -58041,7 +75313,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -58050,7 +75322,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58062,15 +75334,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -758,7 +767,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=gedit.desktop nano.desktop xemacs.desktop pico.desktop xedit.desktop lemacs.desktop nedit.desktop gvim.desktop emacs.desktop Makefile.in Makefile.am 
-+KDE_DIST=nano.desktop gedit.desktop xemacs.desktop pico.desktop xedit.desktop lemacs.desktop nedit.desktop gvim.desktop emacs.desktop Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kappfinder/apps/Utilities/Makefile.in
 +++ kappfinder/apps/Utilities/Makefile.in
 @@ -133,6 +133,7 @@
@@ -58081,7 +75344,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -277,6 +278,9 @@
+@@ -227,7 +228,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58091,7 +75362,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,6 +331,7 @@
+@@ -327,6 +330,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58099,7 +75370,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -334,12 +339,9 @@
+@@ -334,12 +338,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -58112,7 +75383,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,10 +362,13 @@
+@@ -360,10 +361,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -58126,7 +75397,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -372,6 +377,7 @@
+@@ -372,6 +376,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -58134,7 +75405,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -533,6 +539,7 @@
+@@ -533,6 +538,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -58142,7 +75413,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -540,10 +547,12 @@
+@@ -540,10 +546,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -58155,7 +75426,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -574,7 +583,7 @@
+@@ -574,7 +582,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -58164,7 +75435,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +621,9 @@
+@@ -612,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58186,7 +75457,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58196,7 +75475,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58204,7 +75483,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -58217,7 +75496,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -58231,7 +75510,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -58239,7 +75518,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -58247,7 +75526,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -58260,7 +75539,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -58269,7 +75548,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58291,7 +75570,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -324,6 +325,9 @@
+@@ -274,7 +275,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58301,7 +75588,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -374,6 +378,7 @@
+@@ -374,6 +377,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58309,7 +75596,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -381,12 +386,9 @@
+@@ -381,12 +385,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -58322,7 +75609,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,10 +409,13 @@
+@@ -407,10 +408,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -58336,7 +75623,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -419,6 +424,7 @@
+@@ -419,6 +423,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -58344,7 +75631,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -580,6 +586,7 @@
+@@ -580,6 +585,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -58352,7 +75639,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -587,10 +594,12 @@
+@@ -587,10 +593,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -58365,7 +75652,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -627,7 +636,7 @@
+@@ -627,7 +635,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -58374,7 +75661,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -665,9 +674,9 @@
+@@ -665,9 +673,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58386,41 +75673,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1095,25 +1104,25 @@
+@@ -1095,26 +1103,26 @@
  
  #>+ 22
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/hi32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kappfinder.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 +	$(INSTALL_DATA) $(srcdir)/hi32-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-kappfinder.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kappfinder.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kappfinder.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kappfinder.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kappfinder.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
  
  #>+ 15
+ force-reedit:
 --- kate/app/Makefile.in
 +++ kate/app/Makefile.in
 @@ -204,6 +204,7 @@
@@ -58431,7 +75719,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -348,6 +349,9 @@
+@@ -298,7 +299,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -348,6 +348,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58441,7 +75737,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,6 +402,7 @@
+@@ -398,6 +401,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58449,7 +75745,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -405,12 +410,9 @@
+@@ -405,12 +409,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -58462,7 +75758,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -431,10 +433,13 @@
+@@ -431,10 +432,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -58476,7 +75772,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -443,6 +448,7 @@
+@@ -443,6 +447,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -58484,7 +75780,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -604,6 +610,7 @@
+@@ -604,6 +609,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -58492,7 +75788,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -611,10 +618,12 @@
+@@ -611,10 +617,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -58505,7 +75801,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -680,7 +689,7 @@
+@@ -680,7 +688,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -58514,7 +75810,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -718,9 +727,9 @@
+@@ -718,9 +726,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58526,59 +75822,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1197,18 +1206,18 @@
- mocs: katemwmodonhddialog.moc
- 
- #>+ 3
--katepluginmanager.moc: $(srcdir)/katepluginmanager.h
--	$(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc
-+kateexternaltools.moc: $(srcdir)/kateexternaltools.h
-+	$(MOC) $(srcdir)/kateexternaltools.h -o kateexternaltools.moc
- 
- #>+ 2
--mocs: katepluginmanager.moc
-+mocs: kateexternaltools.moc
- 
- #>+ 3
--kateexternaltools.moc: $(srcdir)/kateexternaltools.h
--	$(MOC) $(srcdir)/kateexternaltools.h -o kateexternaltools.moc
-+katepluginmanager.moc: $(srcdir)/katepluginmanager.h
-+	$(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc
- 
- #>+ 2
--mocs: kateexternaltools.moc
-+mocs: katepluginmanager.moc
- 
- #>+ 3
- katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h
-@@ -1291,7 +1300,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  katemdi.moc katesavemodifieddialog.moc kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc katepluginmanager.moc kateexternaltools.moc katemailfilesdialog.moc katetabwidget.moc kateviewspacecontainer.moc katesession.moc katefilelist.moc kateapp.moc kateviewmanager.moc kateconfigplugindialogpage.moc
-+	-rm -f  katemdi.moc katesavemodifieddialog.moc kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateexternaltools.moc katepluginmanager.moc katemailfilesdialog.moc katetabwidget.moc kateviewspacecontainer.moc katesession.moc katefilelist.moc kateapp.moc kateviewmanager.moc kateconfigplugindialogpage.moc
- 
- #>+ 2
- KDE_DIST=katepluginmanager.h katefileselector.h katemdi.h kateviewspace.h katemainwindowiface.h kateexternaltools.h katedocmanageriface.h kateconfigdialog.h kateviewspacecontainer.h kwritemain.h katefilelist.h kateconsole.h katemailfilesdialog.h kateapp.h katesession.h katedocmanager.h katemain.h kateconfigplugindialogpage.h kateappIface.h Makefile.in katemainwindow.h katetabwidget.h kbookmarkhandler.h kateviewmanager.h katemwmodonhddialog.h Makefile.am katesavemodifieddialog.h kategrepdialog.h 
-@@ -1349,7 +1358,7 @@
- 
- 
- #>+ 11
--libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemainwindowiface.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kateappIface.cpp $(srcdir)/katedocmanageriface.cpp $(srcdir)/kateexternaltools.cpp $(srcdir)/katesavemodifieddialog.cpp $(srcdir)/kateviewspacecontainer.cpp $(srcdir)/katemwmodonhddialog.cpp $(srcdir)/katesession.cpp $(srcdir)/katemdi.cpp $(srcdir)/katetabwidget.cpp katemainwindowiface_skel.cpp katedocmanageriface_skel.cpp kateappIface_skel.cpp  katemdi.moc katesavemodifieddialog.moc kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kategrepdialog.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc kateexternaltools.moc katepluginmanager.moc katemailfilesdialog.moc katetabwidget.moc katesession.moc kateviewspacecontainer.moc katefilelist.moc kateapp.moc kateviewmanager.moc kateconfigplugindialogpage.moc
-+libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemainwindowiface.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kateappIface.cpp $(srcdir)/katedocmanageriface.cpp $(srcdir)/kateexternaltools.cpp $(srcdir)/katesavemodifieddialog.cpp $(srcdir)/kateviewspacecontainer.cpp $(srcdir)/katemwmodonhddialog.cpp $(srcdir)/katesession.cpp $(srcdir)/katemdi.cpp $(srcdir)/katetabwidget.cpp katemainwindowiface_skel.cpp katedocmanageriface_skel.cpp kateappIface_skel.cpp  katemdi.moc katesavemodifieddialog.moc kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kategrepdialog.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katemwmodonhddialog.moc katepluginmanager.moc kateexternaltools.moc katemailfilesdialog.moc katetabwidget.moc katesession.moc kateviewspacecontainer.moc katefilelist.moc kateapp.moc kateviewmanager.moc kateconfigplugindialogpage.moc
- 	@echo 'creating libkateinterfaces_la.all_cpp.cpp ...'; \
- 	rm -f libkateinterfaces_la.all_cpp.files libkateinterfaces_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \
-@@ -1451,8 +1460,8 @@
- katemwmodonhddialog.o: katemwmodonhddialog.moc 
- katemailfilesdialog.lo: katemailfilesdialog.moc 
- katefilelist.lo: katefilelist.moc 
--katepluginmanager.o: katepluginmanager.moc 
- kateexternaltools.lo: kateexternaltools.moc 
-+katepluginmanager.o: katepluginmanager.moc 
- kateviewspace.o: kateviewspace.moc 
- kateviewspace.lo: kateviewspace.moc 
- kateapp.lo: kateapp.moc 
 --- kate/data/Makefile.in
 +++ kate/data/Makefile.in
 @@ -128,6 +128,7 @@
@@ -58589,7 +75832,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -272,6 +273,9 @@
+@@ -222,7 +223,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -272,6 +272,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58599,7 +75850,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -322,6 +326,7 @@
+@@ -322,6 +325,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58607,7 +75858,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -329,12 +334,9 @@
+@@ -329,12 +333,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -58620,7 +75871,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -355,10 +357,13 @@
+@@ -355,10 +356,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -58634,7 +75885,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -367,6 +372,7 @@
+@@ -367,6 +371,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -58642,7 +75893,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -528,6 +534,7 @@
+@@ -528,6 +533,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -58650,7 +75901,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -535,10 +542,12 @@
+@@ -535,10 +541,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -58663,7 +75914,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -575,7 +584,7 @@
+@@ -575,7 +583,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -58672,7 +75923,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +622,9 @@
+@@ -613,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58694,7 +75945,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58704,7 +75963,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58712,7 +75971,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -58725,7 +75984,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -58739,7 +75998,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -58747,7 +76006,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -58755,7 +76014,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -58768,7 +76027,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -58777,7 +76036,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -58789,7 +76048,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -902,6 +911,13 @@
+@@ -902,6 +910,13 @@
  .NOEXPORT:
  
  #>+ 3
@@ -58803,7 +76062,7 @@
  documentmanager.moc: $(srcdir)/documentmanager.h
  	$(MOC) $(srcdir)/documentmanager.h -o documentmanager.moc
  
-@@ -909,39 +925,39 @@
+@@ -909,39 +924,39 @@
  mocs: documentmanager.moc
  
  #>+ 3
@@ -58839,26 +76098,26 @@
  #>+ 3
 -pluginconfiginterfaceextension.moc: $(srcdir)/pluginconfiginterfaceextension.h
 -	$(MOC) $(srcdir)/pluginconfiginterfaceextension.h -o pluginconfiginterfaceextension.moc
-+toolviewmanager.moc: $(srcdir)/toolviewmanager.h
-+	$(MOC) $(srcdir)/toolviewmanager.h -o toolviewmanager.moc
++mainwindow.moc: $(srcdir)/mainwindow.h
++	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
  
  #>+ 2
 -mocs: pluginconfiginterfaceextension.moc
-+mocs: toolviewmanager.moc
++mocs: mainwindow.moc
  
  #>+ 3
 -application.moc: $(srcdir)/application.h
 -	$(MOC) $(srcdir)/application.h -o application.moc
-+mainwindow.moc: $(srcdir)/mainwindow.h
-+	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
++toolviewmanager.moc: $(srcdir)/toolviewmanager.h
++	$(MOC) $(srcdir)/toolviewmanager.h -o toolviewmanager.moc
  
  #>+ 2
 -mocs: application.moc
-+mocs: mainwindow.moc
++mocs: toolviewmanager.moc
  
  #>+ 3
  viewmanager.moc: $(srcdir)/viewmanager.h
-@@ -951,15 +967,8 @@
+@@ -951,15 +966,8 @@
  mocs: viewmanager.moc
  
  #>+ 3
@@ -58871,20 +76130,20 @@
 -#>+ 3
  clean-metasources:
 -	-rm -f  documentmanager.moc plugin.moc toolviewmanager.moc mainwindow.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
-+	-rm -f  plugin.moc documentmanager.moc pluginconfiginterfaceextension.moc application.moc pluginmanager.moc toolviewmanager.moc mainwindow.moc viewmanager.moc
++	-rm -f  plugin.moc documentmanager.moc pluginconfiginterfaceextension.moc application.moc pluginmanager.moc mainwindow.moc toolviewmanager.moc viewmanager.moc
  
  #>+ 2
  KDE_DIST=Makefile.in Makefile.am 
-@@ -1006,7 +1015,7 @@
+@@ -1006,7 +1014,7 @@
  
  
  #>+ 11
 -libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp  plugin.moc documentmanager.moc mainwindow.moc toolviewmanager.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
-+libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp  documentmanager.moc plugin.moc mainwindow.moc toolviewmanager.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
++libkateinterfacesprivate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/application.cpp $(srcdir)/mainwindow.cpp $(srcdir)/documentmanager.cpp $(srcdir)/viewmanager.cpp $(srcdir)/toolviewmanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/plugin.cpp $(srcdir)/pluginconfiginterface.cpp $(srcdir)/pluginconfiginterfaceextension.cpp  documentmanager.moc plugin.moc toolviewmanager.moc mainwindow.moc pluginconfiginterfaceextension.moc application.moc viewmanager.moc pluginmanager.moc
  	@echo 'creating libkateinterfacesprivate_la.all_cpp.cpp ...'; \
  	rm -f libkateinterfacesprivate_la.all_cpp.files libkateinterfacesprivate_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkateinterfacesprivate_la.all_cpp.final; \
-@@ -1044,15 +1053,15 @@
+@@ -1044,15 +1052,15 @@
  #>+ 19
  documentmanager.o: documentmanager.moc 
  toolviewmanager.o: toolviewmanager.moc 
@@ -58912,7 +76171,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -269,6 +270,9 @@
+@@ -219,7 +220,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -269,6 +269,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58922,7 +76189,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -319,6 +323,7 @@
+@@ -319,6 +322,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -58930,7 +76197,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -326,12 +331,9 @@
+@@ -326,12 +330,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -58943,7 +76210,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -352,10 +354,13 @@
+@@ -352,10 +353,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -58957,7 +76224,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -364,6 +369,7 @@
+@@ -364,6 +368,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -58965,7 +76232,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -525,6 +531,7 @@
+@@ -525,6 +530,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -58973,7 +76240,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -532,10 +539,12 @@
+@@ -532,10 +538,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -58986,7 +76253,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -562,7 +571,7 @@
+@@ -562,7 +570,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -58995,7 +76262,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +609,9 @@
+@@ -600,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59017,7 +76284,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59027,7 +76302,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59035,7 +76310,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -59048,7 +76323,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -59062,7 +76337,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -59070,7 +76345,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -59078,7 +76353,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -59091,7 +76366,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -59100,7 +76375,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59112,74 +76387,81 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -727,51 +736,51 @@
+@@ -727,51 +735,51 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=cr32-action-highlighting.png lo16-action-unindent.png lo16-action-null.png lo16-action-curfiledir.png lo16-action-indent.png lo22-action-unindent.png cr16-action-modonhd.png lo16-action-modmod.png cr16-action-null.png lo16-action-modified.png cr16-action-curfiledir.png cr16-action-modmod.png Makefile.in cr16-action-modified.png lo16-action-modonhd.png lo22-action-indent.png cr16-action-highlighting.png Makefile.am 
-+KDE_DIST=cr32-action-highlighting.png lo16-action-unindent.png lo16-action-null.png lo16-action-curfiledir.png lo16-action-indent.png lo22-action-unindent.png cr16-action-modonhd.png lo16-action-modmod.png cr16-action-null.png lo16-action-modified.png cr16-action-curfiledir.png cr16-action-modmod.png Makefile.in cr16-action-modified.png lo22-action-indent.png lo16-action-modonhd.png cr16-action-highlighting.png Makefile.am 
++KDE_DIST=cr32-action-highlighting.png lo16-action-unindent.png lo16-action-null.png lo16-action-curfiledir.png lo16-action-indent.png lo22-action-unindent.png cr16-action-modonhd.png lo16-action-modmod.png cr16-action-null.png lo16-action-modified.png cr16-action-modmod.png cr16-action-curfiledir.png Makefile.in cr16-action-modified.png lo22-action-indent.png lo16-action-modonhd.png cr16-action-highlighting.png Makefile.am 
  
  #>+ 2
  docs-am:
  
  #>+ 40
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
- 	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
--	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
- 	$(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
+-	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
- 	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
+-	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
 -	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
--	$(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
- 	$(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
+ 	$(INSTALL_DATA) $(srcdir)/lo16-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
-+	$(INSTALL_DATA) $(srcdir)/lo16-action-modmod.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
-+	$(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
- 	$(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
 -	$(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
 -	$(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
  	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions
  	$(INSTALL_DATA) $(srcdir)/cr32-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
++	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-modmod.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
++	$(mkinstalldirs) $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/lo22-action-indent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-null.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-null.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
++	$(INSTALL_DATA) $(srcdir)/lo16-action-curfiledir.png $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-modonhd.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-highlighting.png $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
++	$(INSTALL_DATA) $(srcdir)/lo22-action-unindent.png $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
  
  uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
 +	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
- 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modmod.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
  	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/null.png
- 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modified.png
  	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/null.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
- 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/curfiledir.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
- 	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modmod.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modified.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/indent.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
-+	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/indent.png
  	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/curfiledir.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/unindent.png
 -	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/16x16/actions/modonhd.png
- 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
--	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
+-	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/32x32/actions/highlighting.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/modonhd.png
+ 	-rm -f $(DESTDIR)$(kateiconsdir)/crystalsvg/16x16/actions/highlighting.png
++	-rm -f $(DESTDIR)$(kateiconsdir)/locolor/22x22/actions/unindent.png
  
  #>+ 15
  force-reedit:
@@ -59193,7 +76475,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -277,6 +278,9 @@
+@@ -227,7 +228,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59203,7 +76493,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,6 +331,7 @@
+@@ -327,6 +330,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59211,7 +76501,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -334,12 +339,9 @@
+@@ -334,12 +338,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -59224,7 +76514,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,10 +362,13 @@
+@@ -360,10 +361,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -59238,7 +76528,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -372,6 +377,7 @@
+@@ -372,6 +376,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -59246,7 +76536,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -533,6 +539,7 @@
+@@ -533,6 +538,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -59254,7 +76544,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -540,10 +547,12 @@
+@@ -540,10 +546,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -59267,7 +76557,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -572,7 +580,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -59276,7 +76566,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -610,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59288,48 +76578,49 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -931,43 +940,43 @@
+@@ -931,43 +939,43 @@
  
  #>+ 39
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
- 	$(INSTALL_DATA) $(srcdir)/hisc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/hisc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/hi48-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
 +	$(INSTALL_DATA) $(srcdir)/hi64-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
 -	$(INSTALL_DATA) $(srcdir)/hi64-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
 -	$(INSTALL_DATA) $(srcdir)/hi128-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
 -	$(INSTALL_DATA) $(srcdir)/hisc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
 -	$(INSTALL_DATA) $(srcdir)/hi32-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwrite.png
--	$(INSTALL_DATA) $(srcdir)/hi64-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
++	$(INSTALL_DATA) $(srcdir)/hi16-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/hisc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
++	$(INSTALL_DATA) $(srcdir)/hisc-app-kwrite2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
 +	$(INSTALL_DATA) $(srcdir)/hi22-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
-+	$(INSTALL_DATA) $(srcdir)/hisc-app-kate2.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 +	$(INSTALL_DATA) $(srcdir)/hi32-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kate.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
@@ -59338,19 +76629,21 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwrite.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwrite.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwrite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kate.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwrite.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwrite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwrite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kwrite2.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kate.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kate2.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kate.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kate.png
  
  #>+ 15
  force-reedit:
@@ -59364,7 +76657,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -301,6 +302,9 @@
+@@ -251,7 +252,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59374,7 +76675,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,6 +355,7 @@
+@@ -351,6 +354,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59382,7 +76683,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -358,12 +363,9 @@
+@@ -358,12 +362,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -59395,7 +76696,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -384,10 +386,13 @@
+@@ -384,10 +385,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -59409,7 +76710,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -396,6 +401,7 @@
+@@ -396,6 +400,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -59417,7 +76718,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -557,6 +563,7 @@
+@@ -557,6 +562,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -59425,7 +76726,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -564,10 +571,12 @@
+@@ -564,10 +570,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -59438,7 +76739,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -59447,7 +76748,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59469,7 +76770,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -287,6 +288,9 @@
+@@ -237,7 +238,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59479,7 +76788,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,6 +341,7 @@
+@@ -337,6 +340,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59487,7 +76796,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -344,12 +349,9 @@
+@@ -344,12 +348,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -59500,7 +76809,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -370,10 +372,13 @@
+@@ -370,10 +371,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -59514,7 +76823,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -382,6 +387,7 @@
+@@ -382,6 +386,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -59522,7 +76831,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -543,6 +549,7 @@
+@@ -543,6 +548,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -59530,7 +76839,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -550,10 +557,12 @@
+@@ -550,10 +556,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -59543,7 +76852,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -589,7 +598,7 @@
+@@ -589,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -59552,7 +76861,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +636,9 @@
+@@ -627,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59574,7 +76883,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -336,6 +337,9 @@
+@@ -286,7 +287,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -336,6 +336,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59584,7 +76901,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -386,6 +390,7 @@
+@@ -386,6 +389,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59592,7 +76909,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -393,12 +398,9 @@
+@@ -393,12 +397,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -59605,7 +76922,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -419,10 +421,13 @@
+@@ -419,10 +420,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -59619,7 +76936,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -431,6 +436,7 @@
+@@ -431,6 +435,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -59627,7 +76944,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -592,6 +598,7 @@
+@@ -592,6 +597,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -59635,7 +76952,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -599,10 +606,12 @@
+@@ -599,10 +605,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -59648,7 +76965,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -650,7 +659,7 @@
+@@ -650,7 +658,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -59657,7 +76974,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -688,9 +697,9 @@
+@@ -688,9 +696,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59679,7 +76996,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -324,6 +325,9 @@
+@@ -274,7 +275,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59689,7 +77014,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -374,6 +378,7 @@
+@@ -374,6 +377,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59697,7 +77022,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -381,12 +386,9 @@
+@@ -381,12 +385,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -59710,7 +77035,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,10 +409,13 @@
+@@ -407,10 +408,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -59724,7 +77049,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -419,6 +424,7 @@
+@@ -419,6 +423,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -59732,7 +77057,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -580,6 +586,7 @@
+@@ -580,6 +585,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -59740,7 +77065,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -587,10 +594,12 @@
+@@ -587,10 +593,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -59753,7 +77078,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -639,7 +648,7 @@
+@@ -639,7 +647,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -59762,7 +77087,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -677,9 +686,9 @@
+@@ -677,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59784,7 +77109,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59794,7 +77127,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59802,7 +77135,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -59815,7 +77148,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -59829,7 +77162,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -59837,7 +77170,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -59845,7 +77178,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -59858,7 +77191,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -59867,7 +77200,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59889,7 +77222,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59899,7 +77240,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -59907,7 +77248,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -59920,7 +77261,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -59934,7 +77275,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -59942,7 +77283,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -59950,7 +77291,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -59963,7 +77304,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -600,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -59972,7 +77313,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -638,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -59994,7 +77335,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -332,6 +333,9 @@
+@@ -282,7 +283,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -332,6 +332,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60004,7 +77353,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,6 +386,7 @@
+@@ -382,6 +385,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60012,7 +77361,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -389,12 +394,9 @@
+@@ -389,12 +393,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -60025,7 +77374,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -415,10 +417,13 @@
+@@ -415,10 +416,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -60039,7 +77388,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -427,6 +432,7 @@
+@@ -427,6 +431,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -60047,7 +77396,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -588,6 +594,7 @@
+@@ -588,6 +593,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -60055,7 +77404,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -595,10 +602,12 @@
+@@ -595,10 +601,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -60068,7 +77417,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -646,7 +655,7 @@
+@@ -646,7 +654,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60077,7 +77426,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -684,9 +693,9 @@
+@@ -684,9 +692,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60089,59 +77438,41 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1102,13 +1111,6 @@
+@@ -1102,18 +1110,18 @@
  
  
  #>+ 3
 -bgrender.moc: $(srcdir)/bgrender.h
 -	$(MOC) $(srcdir)/bgrender.h -o bgrender.moc
--
--#>+ 2
++bgwallpaper.moc: $(srcdir)/bgwallpaper.h
++	$(MOC) $(srcdir)/bgwallpaper.h -o bgwallpaper.moc
+ 
+ #>+ 2
 -mocs: bgrender.moc
--
--#>+ 3
- bgwallpaper.moc: $(srcdir)/bgwallpaper.h
- 	$(MOC) $(srcdir)/bgwallpaper.h -o bgwallpaper.moc
++mocs: bgwallpaper.moc
  
-@@ -1116,11 +1118,11 @@
- mocs: bgwallpaper.moc
- 
  #>+ 3
--bgadvanced.moc: $(srcdir)/bgadvanced.h
--	$(MOC) $(srcdir)/bgadvanced.h -o bgadvanced.moc
+-bgwallpaper.moc: $(srcdir)/bgwallpaper.h
+-	$(MOC) $(srcdir)/bgwallpaper.h -o bgwallpaper.moc
 +bgrender.moc: $(srcdir)/bgrender.h
 +	$(MOC) $(srcdir)/bgrender.h -o bgrender.moc
  
  #>+ 2
--mocs: bgadvanced.moc
+-mocs: bgwallpaper.moc
 +mocs: bgrender.moc
  
  #>+ 3
- bgmonitor.moc: $(srcdir)/bgmonitor.h
-@@ -1130,6 +1132,13 @@
- mocs: bgmonitor.moc
+ bgadvanced.moc: $(srcdir)/bgadvanced.h
+@@ -1145,7 +1153,7 @@
  
  #>+ 3
-+bgadvanced.moc: $(srcdir)/bgadvanced.h
-+	$(MOC) $(srcdir)/bgadvanced.h -o bgadvanced.moc
-+
-+#>+ 2
-+mocs: bgadvanced.moc
-+
-+#>+ 3
- bgdialog.moc: $(srcdir)/bgdialog.h
- 	$(MOC) $(srcdir)/bgdialog.h -o bgdialog.moc
- 
-@@ -1145,7 +1154,7 @@
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  bgrender.moc bgwallpaper.moc bgadvanced.moc bgmonitor.moc bgdialog.moc main.moc
-+	-rm -f  bgwallpaper.moc bgrender.moc bgmonitor.moc bgadvanced.moc bgdialog.moc main.moc
++	-rm -f  bgwallpaper.moc bgrender.moc bgadvanced.moc bgmonitor.moc bgdialog.moc main.moc
  
  #>+ 2
  KDE_DIST=background.desktop bgwallpaper_ui.ui bghash.h bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am 
-@@ -1264,8 +1273,8 @@
+@@ -1264,8 +1272,8 @@
  $(srcdir)/bgmonitor.cpp: bgdialog_ui.h bgwallpaper_ui.h bgadvanced_ui.h 
  bgdialog.lo: bgdialog.moc 
  nmcheck: 
@@ -60161,7 +77492,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60171,7 +77510,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60179,7 +77518,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -60192,7 +77531,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -60206,7 +77545,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -60214,7 +77553,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -60222,7 +77561,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -60235,7 +77574,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -60244,7 +77583,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60266,7 +77605,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -293,6 +294,9 @@
+@@ -243,7 +244,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60276,7 +77623,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,6 +347,7 @@
+@@ -343,6 +346,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60284,7 +77631,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -350,12 +355,9 @@
+@@ -350,12 +354,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -60297,7 +77644,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -376,10 +378,13 @@
+@@ -376,10 +377,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -60311,7 +77658,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -388,6 +393,7 @@
+@@ -388,6 +392,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -60319,7 +77666,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -549,6 +555,7 @@
+@@ -549,6 +554,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -60327,7 +77674,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -556,10 +563,12 @@
+@@ -556,10 +562,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -60340,7 +77687,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -594,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60349,7 +77696,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -632,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60371,7 +77718,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60381,7 +77736,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60389,7 +77744,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -60402,7 +77757,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -60416,7 +77771,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -60424,7 +77779,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -60432,7 +77787,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -60445,7 +77800,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -598,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60454,7 +77809,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -636,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60466,7 +77821,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -929,18 +938,18 @@
+@@ -929,18 +937,18 @@
  
  
  #>+ 3
@@ -60491,7 +77846,7 @@
  
  #>+ 3
  main.moc: $(srcdir)/main.h
-@@ -951,7 +960,7 @@
+@@ -951,7 +959,7 @@
  
  #>+ 3
  clean-metasources:
@@ -60500,7 +77855,7 @@
  
  #>+ 2
  KDE_DIST=clock.desktop dtime.h main.h Makefile.in tzone.h Makefile.am 
-@@ -1002,7 +1011,7 @@
+@@ -1002,7 +1010,7 @@
  
  
  #>+ 11
@@ -60509,7 +77864,7 @@
  	@echo 'creating kcm_clock_la.all_cpp.cpp ...'; \
  	rm -f kcm_clock_la.all_cpp.files kcm_clock_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_clock_la.all_cpp.final; \
-@@ -1044,5 +1053,5 @@
+@@ -1044,5 +1052,5 @@
  nmcheck-am: nmcheck
  dtime.lo: dtime.moc 
  main.o: main.moc 
@@ -60526,7 +77881,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -301,6 +302,9 @@
+@@ -251,7 +252,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60536,7 +77899,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,6 +355,7 @@
+@@ -351,6 +354,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60544,7 +77907,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -358,12 +363,9 @@
+@@ -358,12 +362,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -60557,7 +77920,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -384,10 +386,13 @@
+@@ -384,10 +385,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -60571,7 +77934,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -396,6 +401,7 @@
+@@ -396,6 +400,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -60579,7 +77942,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -557,6 +563,7 @@
+@@ -557,6 +562,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -60587,7 +77950,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -564,10 +571,12 @@
+@@ -564,10 +570,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -60600,7 +77963,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -603,7 +612,7 @@
+@@ -603,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60609,7 +77972,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +650,9 @@
+@@ -641,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60631,7 +77994,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60641,7 +78012,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60649,7 +78020,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -60662,7 +78033,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -60676,7 +78047,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -60684,7 +78055,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -60692,7 +78063,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -60705,7 +78076,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -60714,7 +78085,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60736,7 +78107,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -314,6 +315,9 @@
+@@ -264,7 +265,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -314,6 +314,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60746,7 +78125,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -364,6 +368,7 @@
+@@ -364,6 +367,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60754,7 +78133,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -371,12 +376,9 @@
+@@ -371,12 +375,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -60767,7 +78146,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -397,10 +399,13 @@
+@@ -397,10 +398,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -60781,7 +78160,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -409,6 +414,7 @@
+@@ -409,6 +413,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -60789,7 +78168,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -570,6 +576,7 @@
+@@ -570,6 +575,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -60797,7 +78176,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -577,10 +584,12 @@
+@@ -577,10 +583,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -60810,7 +78189,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -618,7 +627,7 @@
+@@ -618,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60819,7 +78198,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -656,9 +665,9 @@
+@@ -656,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60831,6 +78210,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -1070,7 +1078,7 @@
+ 	-rm -f  componentchooser.moc kcm_componentchooser.moc
+ 
+ #>+ 2
+-KDE_DIST=browserconfig_ui.ui kcm_componentchooser.h emailclientconfig_ui.ui componentconfig_ui.ui terminalemulatorconfig_ui.ui EXAMPLE.desktop componentchooser_ui.ui Makefile.in componentchooser.desktop Makefile.am componentchooser.h 
++KDE_DIST=browserconfig_ui.ui kcm_componentchooser.h emailclientconfig_ui.ui componentconfig_ui.ui terminalemulatorconfig_ui.ui EXAMPLE.desktop componentchooser_ui.ui componentchooser.desktop Makefile.in Makefile.am componentchooser.h 
+ 
+ #>+ 8
+ clean-ui:
 --- kcontrol/crypto/Makefile.in
 +++ kcontrol/crypto/Makefile.in
 @@ -157,6 +157,7 @@
@@ -60841,7 +78229,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -301,6 +302,9 @@
+@@ -251,7 +252,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60851,7 +78247,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,6 +355,7 @@
+@@ -351,6 +354,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60859,7 +78255,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -358,12 +363,9 @@
+@@ -358,12 +362,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -60872,7 +78268,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -384,10 +386,13 @@
+@@ -384,10 +385,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -60886,7 +78282,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -396,6 +401,7 @@
+@@ -396,6 +400,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -60894,7 +78290,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -557,6 +563,7 @@
+@@ -557,6 +562,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -60902,7 +78298,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -564,10 +571,12 @@
+@@ -564,10 +570,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -60915,7 +78311,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -603,7 +612,7 @@
+@@ -603,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -60924,7 +78320,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +650,9 @@
+@@ -641,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60936,6 +78332,49 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -935,18 +943,18 @@
+ 
+ 
+ #>+ 3
+-crypto.moc: $(srcdir)/crypto.h
+-	$(MOC) $(srcdir)/crypto.h -o crypto.moc
++kdatetimedlg.moc: $(srcdir)/kdatetimedlg.h
++	$(MOC) $(srcdir)/kdatetimedlg.h -o kdatetimedlg.moc
+ 
+ #>+ 2
+-mocs: crypto.moc
++mocs: kdatetimedlg.moc
+ 
+ #>+ 3
+-kdatetimedlg.moc: $(srcdir)/kdatetimedlg.h
+-	$(MOC) $(srcdir)/kdatetimedlg.h -o kdatetimedlg.moc
++crypto.moc: $(srcdir)/crypto.h
++	$(MOC) $(srcdir)/crypto.h -o crypto.moc
+ 
+ #>+ 2
+-mocs: kdatetimedlg.moc
++mocs: crypto.moc
+ 
+ #>+ 3
+ certexport.moc: $(srcdir)/certexport.h
+@@ -957,7 +965,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  crypto.moc kdatetimedlg.moc certexport.moc
++	-rm -f  kdatetimedlg.moc crypto.moc certexport.moc
+ 
+ #>+ 2
+ KDE_DIST=certgen.ui crypto.desktop configure.in.in Makefile.in Makefile.am 
+@@ -1008,7 +1016,7 @@
+ 
+ 
+ #>+ 11
+-kcm_crypto_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/crypto.cpp $(srcdir)/certexport.cpp $(srcdir)/kdatetimedlg.cpp  kdatetimedlg.moc crypto.moc certexport.moc
++kcm_crypto_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/crypto.cpp $(srcdir)/certexport.cpp $(srcdir)/kdatetimedlg.cpp  crypto.moc kdatetimedlg.moc certexport.moc
+ 	@echo 'creating kcm_crypto_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_crypto_la.all_cpp.files kcm_crypto_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_crypto_la.all_cpp.final; \
 --- kcontrol/css/Makefile.in
 +++ kcontrol/css/Makefile.in
 @@ -154,6 +154,7 @@
@@ -60946,7 +78385,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -298,6 +299,9 @@
+@@ -248,7 +249,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60956,7 +78403,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,6 +352,7 @@
+@@ -348,6 +351,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -60964,7 +78411,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -355,12 +360,9 @@
+@@ -355,12 +359,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -60977,7 +78424,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -381,10 +383,13 @@
+@@ -381,10 +382,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -60991,7 +78438,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -393,6 +398,7 @@
+@@ -393,6 +397,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -60999,7 +78446,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -554,6 +560,7 @@
+@@ -554,6 +559,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -61007,7 +78454,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -561,10 +568,12 @@
+@@ -561,10 +567,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -61020,7 +78467,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -603,7 +612,7 @@
+@@ -603,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61029,7 +78476,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +650,9 @@
+@@ -641,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61051,7 +78498,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61061,7 +78516,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61069,7 +78524,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -61082,7 +78537,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -61096,7 +78551,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -61104,7 +78559,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -61112,7 +78567,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -61125,7 +78580,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61134,7 +78589,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61156,7 +78611,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -306,6 +307,9 @@
+@@ -256,7 +257,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61166,7 +78629,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,6 +360,7 @@
+@@ -356,6 +359,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61174,7 +78637,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -363,12 +368,9 @@
+@@ -363,12 +367,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -61187,7 +78650,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -389,10 +391,13 @@
+@@ -389,10 +390,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -61201,7 +78664,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -401,6 +406,7 @@
+@@ -401,6 +405,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -61209,7 +78672,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -562,6 +568,7 @@
+@@ -562,6 +567,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -61217,7 +78680,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -569,10 +576,12 @@
+@@ -569,10 +575,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -61230,7 +78693,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -609,7 +618,7 @@
+@@ -609,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61239,7 +78702,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +656,9 @@
+@@ -647,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61261,7 +78724,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -311,6 +312,9 @@
+@@ -261,7 +262,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61271,7 +78742,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -361,6 +365,7 @@
+@@ -361,6 +364,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61279,7 +78750,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -368,12 +373,9 @@
+@@ -368,12 +372,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -61292,7 +78763,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -394,10 +396,13 @@
+@@ -394,10 +395,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -61306,7 +78777,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -406,6 +411,7 @@
+@@ -406,6 +410,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -61314,7 +78785,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -567,6 +573,7 @@
+@@ -567,6 +572,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -61322,7 +78793,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -574,10 +581,12 @@
+@@ -574,10 +580,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -61335,7 +78806,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -613,7 +622,7 @@
+@@ -613,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61344,7 +78815,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +660,9 @@
+@@ -651,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61366,7 +78837,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -332,6 +333,9 @@
+@@ -282,7 +283,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -332,6 +332,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61376,7 +78855,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,6 +386,7 @@
+@@ -382,6 +385,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61384,7 +78863,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -389,12 +394,9 @@
+@@ -389,12 +393,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -61397,7 +78876,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -415,10 +417,13 @@
+@@ -415,10 +416,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -61411,7 +78890,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -427,6 +432,7 @@
+@@ -427,6 +431,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -61419,7 +78898,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -588,6 +594,7 @@
+@@ -588,6 +593,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -61427,7 +78906,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -595,10 +602,12 @@
+@@ -595,10 +601,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -61440,7 +78919,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -652,7 +661,7 @@
+@@ -652,7 +660,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61449,7 +78928,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -690,9 +699,9 @@
+@@ -690,9 +698,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61471,7 +78950,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61481,7 +78968,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61489,7 +78976,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -61502,7 +78989,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -61516,7 +79003,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -61524,7 +79011,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -61532,7 +79019,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -61545,7 +79032,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -644,7 +653,7 @@
+@@ -644,7 +652,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -61554,7 +79041,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -682,9 +691,9 @@
+@@ -682,9 +690,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61566,12 +79053,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -844,7 +853,7 @@
+@@ -844,7 +852,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=kde.desktop leo.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop whatis.desktop qt3.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop technoratitags.desktop msdn.desktop doi.desktop alexa_url.desktop bugno.desktop dmoz.desktop en2fr.desktop acronym.desktop google.desktop fsd.desktop nl-teletekst.desktop webster.desktop katatudo.desktop ctan_cat.desktop wordref.desktop call.desktop google_movie.desktop de2fr.desktop wikipedia.desktop cia.desktop alltheweb.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop php.desktop nl-telephone.desktop feedster.desktop foldoc.desktop en2de.desktop google_news.desktop dbug.desktop wiktionary.desktop qt.desktop kde_websvn.desktop technorati.desktop rfc.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop metacrawler.desktop excite.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop 
-+KDE_DIST=kde.desktop leo.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop whatis.desktop qt3.desktop austronaut.desktop docbook.desktop deb.desktop jeeves.desktop google_lucky.desktop msdn.desktop technoratitags.desktop doi.desktop alexa_url.desktop bugno.desktop dmoz.desktop en2fr.desktop acronym.desktop google.desktop fsd.desktop nl-teletekst.desktop katatudo.desktop webster.desktop ctan_cat.desktop wordref.desktop call.desktop google_movie.desktop de2fr.desktop wikipedia.desktop alltheweb.desktop cia.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop php.desktop nl-telephone.desktop en2de.desktop foldoc.desktop feedster.desktop wiktionary.desktop dbug.desktop google_news.desktop qt.desktop kde_websvn.desktop rfc.desktop technorati.desktop Makefile.in citeseer.desktop rae.desktop backports.desktop excite.desktop fr2en.desktop metacrawler.desktop ctan.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop appsy.desktop hyperdictionary_thesaurus.desktop Makefile.am amg.desktop 
++KDE_DIST=leo.desktop kde.desktop google_groups.desktop it2en.desktop hyperdictionary.desktop bugft.desktop vivisimo.desktop gracenote.desktop de2en.desktop google_images.desktop ruby_application_archive.desktop en2es.desktop imdb.desktop qt3.desktop whatis.desktop austronaut.desktop docbook.desktop deb.desktop google_lucky.desktop jeeves.desktop technoratitags.desktop msdn.desktop doi.desktop alexa_url.desktop bugno.desktop dmoz.desktop google.desktop acronym.desktop en2fr.desktop fsd.desktop nl-teletekst.desktop katatudo.desktop webster.desktop ctan_cat.desktop wordref.desktop call.desktop google_movie.desktop de2fr.desktop wikipedia.desktop alltheweb.desktop cia.desktop lycos.desktop tvtome.desktop cpan.desktop en2it.desktop google_advanced.desktop netcraft.desktop hotbot.desktop freshmeat.desktop alexa.desktop pgpkeys.desktop thesaurus.desktop nl-telephone.desktop php.desktop foldoc.desktop feedster.desktop en2de.desktop dbug.desktop wiktionary.desktop google_news.desktop qt.desktop kde_websvn.desktop rfc.desktop technorati.desktop Makefile.in rae.desktop citeseer.desktop backports.desktop ctan.desktop fr2en.desktop excite.desktop metacrawler.desktop mamma.desktop rpmfind.desktop froogle.desktop es2en.desktop uspto.desktop fr2de.desktop freedb.desktop altavista.desktop python.desktop grec.desktop seek.desktop voila.desktop sourceforge.desktop hyperdictionary_thesaurus.desktop appsy.desktop Makefile.am amg.desktop 
  
  #>+ 2
  docs-am:
@@ -61585,7 +79072,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -320,6 +321,9 @@
+@@ -270,7 +271,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -320,6 +320,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61595,7 +79090,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -370,6 +374,7 @@
+@@ -370,6 +373,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61603,7 +79098,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -377,12 +382,9 @@
+@@ -377,12 +381,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -61616,7 +79111,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,10 +405,13 @@
+@@ -403,10 +404,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -61630,7 +79125,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -415,6 +420,7 @@
+@@ -415,6 +419,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -61638,7 +79133,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -576,6 +582,7 @@
+@@ -576,6 +581,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -61646,7 +79141,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -583,10 +590,12 @@
+@@ -583,10 +589,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -61659,7 +79154,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -625,7 +634,7 @@
+@@ -625,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -61668,7 +79163,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +672,9 @@
+@@ -663,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61690,7 +79185,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61700,7 +79203,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61708,7 +79211,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -61721,7 +79224,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -61735,7 +79238,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -61743,7 +79246,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -61751,7 +79254,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -61764,7 +79267,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -61773,7 +79276,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61795,7 +79298,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61805,7 +79316,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61813,7 +79324,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -61826,7 +79337,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -61840,7 +79351,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -61848,7 +79359,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -61856,7 +79367,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -61869,7 +79380,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61878,7 +79389,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61900,7 +79411,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -312,6 +313,9 @@
+@@ -262,7 +263,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -312,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -61910,7 +79429,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -362,6 +366,7 @@
+@@ -362,6 +365,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -61918,7 +79437,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -369,12 +374,9 @@
+@@ -369,12 +373,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -61931,7 +79450,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -395,10 +397,13 @@
+@@ -395,10 +396,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -61945,7 +79464,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -407,6 +412,7 @@
+@@ -407,6 +411,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -61953,7 +79472,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -568,6 +574,7 @@
+@@ -568,6 +573,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -61961,7 +79480,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -575,10 +582,12 @@
+@@ -575,10 +581,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -61974,7 +79493,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -616,7 +625,7 @@
+@@ -616,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -61983,7 +79502,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +663,9 @@
+@@ -654,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62005,7 +79524,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62015,7 +79542,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62023,7 +79550,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62036,7 +79563,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -62050,7 +79577,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -62058,7 +79585,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -62066,7 +79593,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -62079,7 +79606,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -62088,7 +79615,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62110,7 +79637,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -320,6 +321,9 @@
+@@ -270,7 +271,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -320,6 +320,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62120,7 +79655,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -370,6 +374,7 @@
+@@ -370,6 +373,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62128,7 +79663,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -377,12 +382,9 @@
+@@ -377,12 +381,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62141,7 +79676,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,10 +405,13 @@
+@@ -403,10 +404,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -62155,7 +79690,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -415,6 +420,7 @@
+@@ -415,6 +419,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -62163,7 +79698,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -576,6 +582,7 @@
+@@ -576,6 +581,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -62171,7 +79706,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -583,10 +590,12 @@
+@@ -583,10 +589,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -62184,7 +79719,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -633,7 +642,7 @@
+@@ -633,7 +641,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62193,7 +79728,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -671,9 +680,9 @@
+@@ -671,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62215,7 +79750,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -304,6 +305,9 @@
+@@ -254,7 +255,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -304,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62225,7 +79768,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,6 +358,7 @@
+@@ -354,6 +357,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62233,7 +79776,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -361,12 +366,9 @@
+@@ -361,12 +365,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62246,7 +79789,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -387,10 +389,13 @@
+@@ -387,10 +388,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -62260,7 +79803,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -399,6 +404,7 @@
+@@ -399,6 +403,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -62268,7 +79811,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -560,6 +566,7 @@
+@@ -560,6 +565,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -62276,7 +79819,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -567,10 +574,12 @@
+@@ -567,10 +573,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -62289,7 +79832,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -610,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62298,7 +79841,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -648,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62320,7 +79863,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -306,6 +307,9 @@
+@@ -256,7 +257,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62330,7 +79881,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,6 +360,7 @@
+@@ -356,6 +359,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62338,7 +79889,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -363,12 +368,9 @@
+@@ -363,12 +367,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62351,7 +79902,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -389,10 +391,13 @@
+@@ -389,10 +390,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -62365,7 +79916,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -401,6 +406,7 @@
+@@ -401,6 +405,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -62373,7 +79924,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -562,6 +568,7 @@
+@@ -562,6 +567,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -62381,7 +79932,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -569,10 +576,12 @@
+@@ -569,10 +575,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -62394,7 +79945,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -611,7 +620,7 @@
+@@ -611,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62403,7 +79954,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +658,9 @@
+@@ -649,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62415,6 +79966,49 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -961,18 +969,18 @@
+ 
+ 
+ #>+ 3
+-iconthemes.moc: $(srcdir)/iconthemes.h
+-	$(MOC) $(srcdir)/iconthemes.h -o iconthemes.moc
++icons.moc: $(srcdir)/icons.h
++	$(MOC) $(srcdir)/icons.h -o icons.moc
+ 
+ #>+ 2
+-mocs: iconthemes.moc
++mocs: icons.moc
+ 
+ #>+ 3
+-icons.moc: $(srcdir)/icons.h
+-	$(MOC) $(srcdir)/icons.h -o icons.moc
++iconthemes.moc: $(srcdir)/iconthemes.h
++	$(MOC) $(srcdir)/iconthemes.h -o iconthemes.moc
+ 
+ #>+ 2
+-mocs: icons.moc
++mocs: iconthemes.moc
+ 
+ #>+ 3
+ main.moc: $(srcdir)/main.h
+@@ -983,7 +991,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  iconthemes.moc icons.moc main.moc
++	-rm -f  icons.moc iconthemes.moc main.moc
+ 
+ #>+ 2
+ KDE_DIST=icons.desktop Makefile.in uninstall.desktop Makefile.am 
+@@ -1034,7 +1042,7 @@
+ 
+ 
+ #>+ 11
+-kcm_icons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconthemes.cpp $(srcdir)/icons.cpp $(srcdir)/main.cpp  icons.moc iconthemes.moc main.moc
++kcm_icons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/iconthemes.cpp $(srcdir)/icons.cpp $(srcdir)/main.cpp  iconthemes.moc icons.moc main.moc
+ 	@echo 'creating kcm_icons_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_icons_la.all_cpp.files kcm_icons_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
 --- kcontrol/info/Makefile.in
 +++ kcontrol/info/Makefile.in
 @@ -157,6 +157,7 @@
@@ -62425,7 +80019,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -301,6 +302,9 @@
+@@ -251,7 +252,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62435,7 +80037,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,6 +355,7 @@
+@@ -351,6 +354,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62443,7 +80045,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -358,12 +363,9 @@
+@@ -358,12 +362,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62456,7 +80058,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -384,10 +386,13 @@
+@@ -384,10 +385,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -62470,7 +80072,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -396,6 +401,7 @@
+@@ -396,6 +400,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -62478,7 +80080,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -557,6 +563,7 @@
+@@ -557,6 +562,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -62486,7 +80088,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -564,10 +571,12 @@
+@@ -564,10 +570,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -62499,7 +80101,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -606,7 +615,7 @@
+@@ -606,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62508,7 +80110,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +653,9 @@
+@@ -644,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62520,6 +80122,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -948,7 +956,7 @@
+ 	-rm -f  memory.moc
+ 
+ #>+ 2
+-KDE_DIST=memory_linux.cpp configure.in.bot info_netbsd.cpp partitions.desktop info_solaris.cpp pci.desktop xserver.desktop info_generic.cpp interrupts.desktop info_linux.cpp memory.desktop info.cpp info_svr4.cpp ioports.desktop memory_solaris.cpp info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_fbsd.cpp info_hpux.cpp info.h memory_tru64.cpp devices.desktop memory_fbsd.cpp configure.in.in opengl.desktop dma.desktop memory_osx.cpp info_osx.cpp Makefile.in processor.desktop memory_hpux.cpp info_aix.cpp scsi.desktop Makefile.am memory.h 
++KDE_DIST=memory_linux.cpp configure.in.bot info_netbsd.cpp partitions.desktop info_solaris.cpp pci.desktop xserver.desktop info_generic.cpp interrupts.desktop info_linux.cpp memory.desktop info.cpp info_svr4.cpp memory_solaris.cpp ioports.desktop info_openbsd.cpp info_sgi.cpp sound.desktop memory_netbsd.cpp memory_sgi.cpp info_hpux.cpp info_fbsd.cpp info.h devices.desktop memory_tru64.cpp memory_fbsd.cpp configure.in.in opengl.desktop dma.desktop memory_osx.cpp info_osx.cpp Makefile.in processor.desktop memory_hpux.cpp info_aix.cpp scsi.desktop Makefile.am memory.h 
+ 
+ #>+ 3
+ clean-closures:
 --- kcontrol/input/core/Makefile.in
 +++ kcontrol/input/core/Makefile.in
 @@ -140,6 +140,7 @@
@@ -62530,7 +80141,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -284,6 +285,9 @@
+@@ -234,7 +235,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62540,7 +80159,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -334,6 +338,7 @@
+@@ -334,6 +337,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62548,7 +80167,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -341,12 +346,9 @@
+@@ -341,12 +345,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62561,7 +80180,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,10 +369,13 @@
+@@ -367,10 +368,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -62575,7 +80194,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -379,6 +384,7 @@
+@@ -379,6 +383,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -62583,7 +80202,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -540,6 +546,7 @@
+@@ -540,6 +545,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -62591,7 +80210,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -547,10 +554,12 @@
+@@ -547,10 +553,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -62604,7 +80223,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -581,7 +590,7 @@
+@@ -581,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62613,7 +80232,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +628,9 @@
+@@ -619,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62635,7 +80254,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -329,6 +330,9 @@
+@@ -279,7 +280,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -329,6 +329,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62645,7 +80272,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -379,6 +383,7 @@
+@@ -379,6 +382,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62653,7 +80280,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -386,12 +391,9 @@
+@@ -386,12 +390,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62666,7 +80293,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -412,10 +414,13 @@
+@@ -412,10 +413,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -62680,7 +80307,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -424,6 +429,7 @@
+@@ -424,6 +428,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -62688,7 +80315,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -585,6 +591,7 @@
+@@ -585,6 +590,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -62696,7 +80323,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -592,10 +599,12 @@
+@@ -592,10 +598,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -62709,7 +80336,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -647,7 +656,7 @@
+@@ -647,7 +655,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62718,7 +80345,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -685,9 +694,9 @@
+@@ -685,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62730,7 +80357,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1179,7 +1188,7 @@
+@@ -1179,7 +1187,7 @@
  	-rm -f  logitechmouse.moc mouse.moc
  
  #>+ 2
@@ -62749,7 +80376,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62759,7 +80394,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62767,7 +80402,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62780,7 +80415,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -62794,7 +80429,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -62802,7 +80437,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -62810,7 +80445,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -62823,7 +80458,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -62832,7 +80467,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62854,7 +80489,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -287,6 +288,9 @@
+@@ -237,7 +238,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62864,7 +80507,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -337,6 +341,7 @@
+@@ -337,6 +340,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62872,7 +80515,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -344,12 +349,9 @@
+@@ -344,12 +348,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62885,7 +80528,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -370,10 +372,13 @@
+@@ -370,10 +371,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -62899,7 +80542,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -382,6 +387,7 @@
+@@ -382,6 +386,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -62907,7 +80550,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -543,6 +549,7 @@
+@@ -543,6 +548,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -62915,7 +80558,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -550,10 +557,12 @@
+@@ -550,10 +556,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -62928,7 +80571,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -584,7 +593,7 @@
+@@ -584,7 +592,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62937,7 +80580,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +631,9 @@
+@@ -622,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62959,7 +80602,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -294,6 +295,9 @@
+@@ -244,7 +245,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62969,7 +80620,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,6 +348,7 @@
+@@ -344,6 +347,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62977,7 +80628,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -351,12 +356,9 @@
+@@ -351,12 +355,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62990,7 +80641,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,10 +379,13 @@
+@@ -377,10 +378,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -63004,7 +80655,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -389,6 +394,7 @@
+@@ -389,6 +393,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -63012,7 +80663,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -550,6 +556,7 @@
+@@ -550,6 +555,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -63020,7 +80671,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -557,10 +564,12 @@
+@@ -557,10 +563,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -63033,7 +80684,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -595,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63042,7 +80693,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -633,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63064,7 +80715,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63074,7 +80733,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63082,7 +80741,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -63095,7 +80754,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -63109,7 +80768,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -63117,7 +80776,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -63125,7 +80784,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -63138,7 +80797,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -606,7 +615,7 @@
+@@ -606,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63147,7 +80806,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +653,9 @@
+@@ -644,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63169,7 +80828,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63179,7 +80846,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63187,7 +80854,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -63200,7 +80867,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -63214,7 +80881,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -63222,7 +80889,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -63230,7 +80897,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -63243,7 +80910,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -63252,7 +80919,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63274,7 +80941,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -350,6 +351,9 @@
+@@ -300,7 +301,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -350,6 +350,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63284,7 +80959,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,7 @@
+@@ -400,6 +403,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63292,7 +80967,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -407,12 +412,9 @@
+@@ -407,12 +411,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -63305,7 +80980,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -433,10 +435,13 @@
+@@ -433,10 +434,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -63319,7 +80994,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -445,6 +450,7 @@
+@@ -445,6 +449,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -63327,7 +81002,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -606,6 +612,7 @@
+@@ -606,6 +611,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -63335,7 +81010,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -613,10 +620,12 @@
+@@ -613,10 +619,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -63348,7 +81023,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -672,7 +681,7 @@
+@@ -672,7 +680,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63357,7 +81032,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -710,9 +719,9 @@
+@@ -710,9 +718,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63369,63 +81044,40 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1257,11 +1266,11 @@
+@@ -1257,6 +1265,13 @@
  mocs: indexwidget.moc
  
  #>+ 3
--dockcontainer.moc: $(srcdir)/dockcontainer.h
--	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
 +moduleiconview.moc: $(srcdir)/moduleiconview.h
 +	$(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
- 
- #>+ 2
--mocs: dockcontainer.moc
++
++#>+ 2
 +mocs: moduleiconview.moc
++
++#>+ 3
+ dockcontainer.moc: $(srcdir)/dockcontainer.h
+ 	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
  
- #>+ 3
- aboutwidget.moc: $(srcdir)/aboutwidget.h
-@@ -1271,11 +1280,11 @@
+@@ -1271,13 +1286,6 @@
  mocs: aboutwidget.moc
  
  #>+ 3
 -moduleiconview.moc: $(srcdir)/moduleiconview.h
 -	$(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
-+dockcontainer.moc: $(srcdir)/dockcontainer.h
-+	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: moduleiconview.moc
-+mocs: dockcontainer.moc
- 
- #>+ 3
+-
+-#>+ 3
  proxywidget.moc: $(srcdir)/proxywidget.h
-@@ -1320,25 +1329,25 @@
- mocs: modulemenu.moc
+ 	$(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
  
- #>+ 3
--moduleIface.moc: $(srcdir)/moduleIface.h
--	$(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
-+searchwidget.moc: $(srcdir)/searchwidget.h
-+	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
+@@ -1335,10 +1343,10 @@
  
- #>+ 2
--mocs: moduleIface.moc
-+mocs: searchwidget.moc
- 
  #>+ 3
--searchwidget.moc: $(srcdir)/searchwidget.h
--	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
-+moduleIface.moc: $(srcdir)/moduleIface.h
-+	$(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
- 
- #>+ 2
--mocs: searchwidget.moc
-+mocs: moduleIface.moc
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  indexwidget.moc dockcontainer.moc aboutwidget.moc moduleiconview.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
-+	-rm -f  indexwidget.moc moduleiconview.moc aboutwidget.moc dockcontainer.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc searchwidget.moc moduleIface.moc
++	-rm -f  indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc modulemenu.moc moduleIface.moc searchwidget.moc
  
  #>+ 2
 -KDE_DIST=cr48-app-kcontrol.png KControl_NoDisplay.desktop aboutwidget.h toplevel.h kcontrolui.rc helpwidget.h main.h searchwidget.h dockcontainer.h cr16-app-kcontrol.png KControl.desktop modules.h cr32-app-kcontrol.png proxywidget.h cr64-app-kcontrol.png global.h modulemenu.cpp modulemenu.h kinfocenterui.rc kinfocenter.desktop moduletreeview.h Makefile.in moduleiconview.h version.h cr128-app-kcontrol.png indexwidget.h moduleIface.h Makefile.am kcrootonly.h 
@@ -63433,37 +81085,45 @@
  
  #>+ 4
  clean-idl:
-@@ -1350,21 +1359,21 @@
+@@ -1350,23 +1358,23 @@
  
  #>+ 19
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
 +	$(INSTALL_DATA) $(srcdir)/cr128-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/cr48-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcontrol.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcontrol.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcontrol.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcontrol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcontrol.png
  
-@@ -1407,7 +1416,7 @@
+ #>+ 15
+ force-reedit:
+@@ -1407,7 +1415,7 @@
  
  
  #>+ 11
 -libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp  indexwidget.moc moduleiconview.moc aboutwidget.moc dockcontainer.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
-+libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp  indexwidget.moc dockcontainer.moc aboutwidget.moc moduleiconview.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc moduleIface.moc searchwidget.moc
++libkdeinit_kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/moduleIface.cpp $(srcdir)/global.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/searchwidget.cpp moduleIface_skel.cpp  indexwidget.moc aboutwidget.moc dockcontainer.moc moduleiconview.moc proxywidget.moc main.moc modules.moc moduletreeview.moc toplevel.moc searchwidget.moc moduleIface.moc
  	@echo 'creating libkdeinit_kcontrol_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_kcontrol_la.all_cpp.files libkdeinit_kcontrol_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kcontrol_la.all_cpp.final; \
@@ -63477,7 +81137,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -294,6 +295,9 @@
+@@ -244,7 +245,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63487,7 +81155,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,6 +348,7 @@
+@@ -344,6 +347,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63495,7 +81163,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -351,12 +356,9 @@
+@@ -351,12 +355,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -63508,7 +81176,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,10 +379,13 @@
+@@ -377,10 +378,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -63522,7 +81190,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -389,6 +394,7 @@
+@@ -389,6 +393,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -63530,7 +81198,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -550,6 +556,7 @@
+@@ -550,6 +555,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -63538,7 +81206,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -557,10 +564,12 @@
+@@ -557,10 +563,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -63551,7 +81219,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -595,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63560,7 +81228,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -633,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63572,6 +81240,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -935,7 +943,7 @@
+ 	-rm -f  kcmkded.moc
+ 
+ #>+ 2
+-KDE_DIST=kcmkded.desktop Makefile.in kcmkded.h Makefile.am 
++KDE_DIST=kcmkded.desktop kcmkded.h Makefile.in Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
 --- kcontrol/kdm/Makefile.in
 +++ kcontrol/kdm/Makefile.in
 @@ -161,6 +161,7 @@
@@ -63582,7 +81259,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -305,6 +306,9 @@
+@@ -255,7 +256,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63592,7 +81277,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -355,6 +359,7 @@
+@@ -355,6 +358,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63600,7 +81285,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -362,12 +367,9 @@
+@@ -362,12 +366,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -63613,7 +81298,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -388,10 +390,13 @@
+@@ -388,10 +389,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -63627,7 +81312,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -400,6 +405,7 @@
+@@ -400,6 +404,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -63635,7 +81320,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -561,6 +567,7 @@
+@@ -561,6 +566,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -63643,7 +81328,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -568,10 +575,12 @@
+@@ -568,10 +574,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -63656,7 +81341,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -613,7 +622,7 @@
+@@ -613,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63665,7 +81350,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +660,9 @@
+@@ -651,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63687,7 +81372,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -305,6 +306,9 @@
+@@ -255,7 +256,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63697,7 +81390,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -355,6 +359,7 @@
+@@ -355,6 +358,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63705,7 +81398,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -362,12 +367,9 @@
+@@ -362,12 +366,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -63718,7 +81411,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -388,10 +390,13 @@
+@@ -388,10 +389,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -63732,7 +81425,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -400,6 +405,7 @@
+@@ -400,6 +404,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -63740,7 +81433,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -561,6 +567,7 @@
+@@ -561,6 +566,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -63748,7 +81441,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -568,10 +575,12 @@
+@@ -568,10 +574,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -63761,7 +81454,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -611,7 +620,7 @@
+@@ -611,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63770,7 +81463,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +658,9 @@
+@@ -649,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63782,7 +81475,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1018,18 +1027,18 @@
+@@ -1018,18 +1026,18 @@
  mocs: treeview.moc
  
  #>+ 3
@@ -63807,7 +81500,7 @@
  
  #>+ 3
  keyconfig.moc: $(srcdir)/keyconfig.h
-@@ -1047,7 +1056,7 @@
+@@ -1047,7 +1055,7 @@
  
  #>+ 3
  clean-metasources:
@@ -63816,7 +81509,7 @@
  
  #>+ 2
  KDE_DIST=keys.desktop commandShortcuts.h kaccelaction.h treeview.h win3.kksrc main.h kde4.kksrc shortcuts.h win4.kksrc mac4.kksrc khotkeys.h modifiers.h keyconfig.h keyconfig.cpp wm3.kksrc convertShortcuts.pl unix3.kksrc Makefile.in kde3.kksrc kaccel.upd Makefile.am 
-@@ -1098,7 +1107,7 @@
+@@ -1098,7 +1106,7 @@
  
  
  #>+ 11
@@ -63835,7 +81528,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -306,6 +307,9 @@
+@@ -256,7 +257,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63845,7 +81546,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,6 +360,7 @@
+@@ -356,6 +359,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63853,7 +81554,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -363,12 +368,9 @@
+@@ -363,12 +367,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -63866,7 +81567,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -389,10 +391,13 @@
+@@ -389,10 +390,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -63880,7 +81581,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -401,6 +406,7 @@
+@@ -401,6 +405,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -63888,7 +81589,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -562,6 +568,7 @@
+@@ -562,6 +567,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -63896,7 +81597,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -569,10 +576,12 @@
+@@ -569,10 +575,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -63909,7 +81610,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -625,7 +634,7 @@
+@@ -625,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -63918,7 +81619,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +672,9 @@
+@@ -663,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -63930,25 +81631,26 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -989,15 +998,15 @@
+@@ -987,16 +995,16 @@
+ 
+ #>+ 13
  install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/cr32-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
  	$(INSTALL_DATA) $(srcdir)/cr16-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-newfont.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
  
  uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/newfont.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/newfont.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/newfont.png
  
  #>+ 15
- force-reedit:
 --- kcontrol/kfontinst/kfile-plugin/Makefile.in
 +++ kcontrol/kfontinst/kfile-plugin/Makefile.in
 @@ -154,6 +154,7 @@
@@ -63959,7 +81661,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -298,6 +299,9 @@
+@@ -248,7 +249,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63969,7 +81679,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,6 +352,7 @@
+@@ -348,6 +351,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -63977,7 +81687,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -355,12 +360,9 @@
+@@ -355,12 +359,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -63990,7 +81700,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -381,10 +383,13 @@
+@@ -381,10 +382,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -64004,7 +81714,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -393,6 +398,7 @@
+@@ -393,6 +397,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -64012,7 +81722,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -554,6 +560,7 @@
+@@ -554,6 +559,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -64020,7 +81730,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -561,10 +568,12 @@
+@@ -561,10 +567,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -64033,7 +81743,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64042,7 +81752,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64064,7 +81774,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -306,6 +307,9 @@
+@@ -256,7 +257,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64074,7 +81792,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,6 +360,7 @@
+@@ -356,6 +359,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64082,7 +81800,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -363,12 +368,9 @@
+@@ -363,12 +367,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -64095,7 +81813,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -389,10 +391,13 @@
+@@ -389,10 +390,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -64109,7 +81827,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -401,6 +406,7 @@
+@@ -401,6 +405,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -64117,7 +81835,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -562,6 +568,7 @@
+@@ -562,6 +567,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -64125,7 +81843,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -569,10 +576,12 @@
+@@ -569,10 +575,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -64138,7 +81856,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -617,7 +626,7 @@
+@@ -617,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -64147,7 +81865,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +664,9 @@
+@@ -655,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64169,7 +81887,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64179,7 +81905,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64187,7 +81913,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -64200,7 +81926,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -64214,7 +81940,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -64222,7 +81948,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -64230,7 +81956,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -64243,7 +81969,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -614,7 +623,7 @@
+@@ -614,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64252,7 +81978,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +661,9 @@
+@@ -652,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64264,15 +81990,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -978,7 +987,7 @@
- 
- 
- #>+ 2
--KDE_DIST=system-folder.desktop package.desktop fonts.protocol folder.desktop fonts.desktop Makefile.in Makefile.am 
-+KDE_DIST=system-folder.desktop package.desktop folder.desktop fonts.protocol fonts.desktop Makefile.in Makefile.am 
- 
- #>+ 3
- clean-closures:
 --- kcontrol/kfontinst/lib/Makefile.in
 +++ kcontrol/kfontinst/lib/Makefile.in
 @@ -154,6 +154,7 @@
@@ -64283,7 +82000,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -298,6 +299,9 @@
+@@ -248,7 +249,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64293,7 +82018,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,6 +352,7 @@
+@@ -348,6 +351,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64301,7 +82026,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -355,12 +360,9 @@
+@@ -355,12 +359,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -64314,7 +82039,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -381,10 +383,13 @@
+@@ -381,10 +382,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -64328,7 +82053,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -393,6 +398,7 @@
+@@ -393,6 +397,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -64336,7 +82061,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -554,6 +560,7 @@
+@@ -554,6 +559,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -64344,7 +82069,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -561,10 +568,12 @@
+@@ -561,10 +567,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -64357,7 +82082,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -605,7 +614,7 @@
+@@ -605,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64366,7 +82091,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +652,9 @@
+@@ -643,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64388,7 +82113,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -279,6 +280,9 @@
+@@ -229,7 +230,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -279,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64398,7 +82131,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -329,6 +333,7 @@
+@@ -329,6 +332,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64406,7 +82139,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -336,12 +341,9 @@
+@@ -336,12 +340,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -64419,7 +82152,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -362,10 +364,13 @@
+@@ -362,10 +363,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -64433,7 +82166,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -374,6 +379,7 @@
+@@ -374,6 +378,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -64441,7 +82174,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -535,6 +541,7 @@
+@@ -535,6 +540,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -64449,7 +82182,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -542,10 +549,12 @@
+@@ -542,10 +548,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -64462,7 +82195,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -576,7 +585,7 @@
+@@ -576,7 +584,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -64471,7 +82204,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +623,9 @@
+@@ -614,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64493,7 +82226,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64503,7 +82244,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64511,7 +82252,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -64524,7 +82265,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -64538,7 +82279,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -64546,7 +82287,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -64554,7 +82295,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -64567,7 +82308,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -600,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64576,7 +82317,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -638,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64598,7 +82339,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -323,6 +324,9 @@
+@@ -273,7 +274,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -323,6 +323,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64608,7 +82357,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -373,6 +377,7 @@
+@@ -373,6 +376,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64616,7 +82365,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -380,12 +385,9 @@
+@@ -380,12 +384,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -64629,7 +82378,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,10 +408,13 @@
+@@ -406,10 +407,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -64643,7 +82392,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -418,6 +423,7 @@
+@@ -418,6 +422,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -64651,7 +82400,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -579,6 +585,7 @@
+@@ -579,6 +584,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -64659,7 +82408,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -586,10 +593,12 @@
+@@ -586,10 +592,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -64672,7 +82421,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -633,7 +642,7 @@
+@@ -633,7 +641,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64681,7 +82430,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -671,9 +680,9 @@
+@@ -671,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64693,46 +82442,61 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1036,6 +1045,13 @@
+@@ -1036,11 +1044,11 @@
  .NOEXPORT:
  
  #>+ 3
+-FontViewPart.moc: $(srcdir)/FontViewPart.h
+-	$(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
 +FontViewerApp.moc: $(srcdir)/FontViewerApp.h
 +	$(MOC) $(srcdir)/FontViewerApp.h -o FontViewerApp.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: FontViewPart.moc
 +mocs: FontViewerApp.moc
-+
-+#>+ 3
- FontViewPart.moc: $(srcdir)/FontViewPart.h
- 	$(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
  
-@@ -1050,13 +1066,6 @@
+ #>+ 3
+ FontViewPartFactory.moc: $(srcdir)/FontViewPartFactory.h
+@@ -1050,11 +1058,11 @@
  mocs: FontViewPartFactory.moc
  
  #>+ 3
 -FontViewerApp.moc: $(srcdir)/FontViewerApp.h
 -	$(MOC) $(srcdir)/FontViewerApp.h -o FontViewerApp.moc
--
--#>+ 2
++FontViewPart.moc: $(srcdir)/FontViewPart.h
++	$(MOC) $(srcdir)/FontViewPart.h -o FontViewPart.moc
+ 
+ #>+ 2
 -mocs: FontViewerApp.moc
--
--#>+ 3
++mocs: FontViewPart.moc
+ 
+ #>+ 3
  FontPreview.moc: $(srcdir)/FontPreview.h
- 	$(MOC) $(srcdir)/FontPreview.h -o FontPreview.moc
+@@ -1074,7 +1082,7 @@
  
-@@ -1074,7 +1083,7 @@
- 
  #>+ 3
  clean-metasources:
 -	-rm -f  FontViewPart.moc FontViewPartFactory.moc FontViewerApp.moc FontPreview.moc
-+	-rm -f  FontViewerApp.moc FontViewPart.moc FontViewPartFactory.moc FontPreview.moc
++	-rm -f  FontViewerApp.moc FontViewPartFactory.moc FontViewPart.moc FontPreview.moc
  
  #>+ 2
  KDE_DIST=kfontviewui.rc kfontviewpart.desktop kfontview.desktop Makefile.in Makefile.am kfontviewpart.rc 
-@@ -1168,6 +1177,6 @@
- FontViewPart.o: FontViewPart.moc 
+@@ -1125,7 +1133,7 @@
+ 
+ 
+ #>+ 11
+-libkfontviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/FontViewPart.cpp $(srcdir)/FontViewPartFactory.cpp $(srcdir)/FontPreview.cpp  FontViewPartFactory.moc FontViewPart.moc FontPreview.moc
++libkfontviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/FontViewPart.cpp $(srcdir)/FontViewPartFactory.cpp $(srcdir)/FontPreview.cpp  FontViewPart.moc FontViewPartFactory.moc FontPreview.moc
+ 	@echo 'creating libkfontviewpart_la.all_cpp.cpp ...'; \
+ 	rm -f libkfontviewpart_la.all_cpp.files libkfontviewpart_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkfontviewpart_la.all_cpp.final; \
+@@ -1165,9 +1173,9 @@
+ FontPreview.lo: FontPreview.moc 
+ FontPreview.o: FontPreview.moc 
+ nmcheck-am: nmcheck
+-FontViewPart.o: FontViewPart.moc 
  FontViewPartFactory.lo: FontViewPartFactory.moc 
++FontViewPart.o: FontViewPart.moc 
  FontViewPart.lo: FontViewPart.moc 
 -FontViewPartFactory.o: FontViewPartFactory.moc 
  FontViewerApp.lo: FontViewerApp.moc 
@@ -64748,7 +82512,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -310,6 +311,9 @@
+@@ -260,7 +261,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -310,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64758,7 +82530,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -360,6 +364,7 @@
+@@ -360,6 +363,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64766,7 +82538,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -367,12 +372,9 @@
+@@ -367,12 +371,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -64779,7 +82551,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -393,10 +395,13 @@
+@@ -393,10 +394,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -64793,7 +82565,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -405,6 +410,7 @@
+@@ -405,6 +409,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -64801,7 +82573,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -566,6 +572,7 @@
+@@ -566,6 +571,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -64809,7 +82581,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -573,10 +580,12 @@
+@@ -573,10 +579,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -64822,7 +82594,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -633,7 +642,7 @@
+@@ -633,7 +641,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64831,7 +82603,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -671,9 +680,9 @@
+@@ -671,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64843,44 +82615,68 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1017,18 +1026,18 @@
- mocs: lookandfeelconfig.moc
+@@ -1010,11 +1018,11 @@
  
+ 
  #>+ 3
--menutab_impl.moc: $(srcdir)/menutab_impl.h
--	$(MOC) $(srcdir)/menutab_impl.h -o menutab_impl.moc
+-lookandfeelconfig.moc: $(srcdir)/lookandfeelconfig.h
+-	$(MOC) $(srcdir)/lookandfeelconfig.h -o lookandfeelconfig.moc
 +applettab_impl.moc: $(srcdir)/applettab_impl.h
 +	$(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
  
  #>+ 2
--mocs: menutab_impl.moc
+-mocs: lookandfeelconfig.moc
 +mocs: applettab_impl.moc
  
  #>+ 3
+ menutab_impl.moc: $(srcdir)/menutab_impl.h
+@@ -1024,11 +1032,11 @@
+ mocs: menutab_impl.moc
+ 
+ #>+ 3
 -applettab_impl.moc: $(srcdir)/applettab_impl.h
 -	$(MOC) $(srcdir)/applettab_impl.h -o applettab_impl.moc
-+menutab_impl.moc: $(srcdir)/menutab_impl.h
-+	$(MOC) $(srcdir)/menutab_impl.h -o menutab_impl.moc
++lookandfeelconfig.moc: $(srcdir)/lookandfeelconfig.h
++	$(MOC) $(srcdir)/lookandfeelconfig.h -o lookandfeelconfig.moc
  
  #>+ 2
 -mocs: applettab_impl.moc
-+mocs: menutab_impl.moc
++mocs: lookandfeelconfig.moc
  
  #>+ 3
  positionconfig.moc: $(srcdir)/positionconfig.h
-@@ -1095,10 +1104,10 @@
+@@ -1095,10 +1103,10 @@
  
  #>+ 3
  clean-metasources:
 -	-rm -f  lookandfeelconfig.moc menutab_impl.moc applettab_impl.moc positionconfig.moc lookandfeeltab_kcm.moc main.moc menuconfig.moc hidingtab_impl.moc hidingconfig.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
-+	-rm -f  lookandfeelconfig.moc applettab_impl.moc menutab_impl.moc positionconfig.moc lookandfeeltab_kcm.moc main.moc menuconfig.moc hidingtab_impl.moc hidingconfig.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
++	-rm -f  applettab_impl.moc menutab_impl.moc lookandfeelconfig.moc positionconfig.moc lookandfeeltab_kcm.moc main.moc menuconfig.moc hidingtab_impl.moc hidingconfig.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
  
  #>+ 2
 -KDE_DIST=applettab_impl.h lookandfeelconfig.h lookandfeeltab.ui lookandfeeltab_kcm.h kicker_config_menus.desktop advancedOptions.ui hidingconfig.h panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config_arrangement.desktop kicker_config.desktop menutab.ui menuconfig.h applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp positionconfig.h kicker_config_hiding.desktop Makefile.am 
-+KDE_DIST=applettab_impl.h lookandfeelconfig.h lookandfeeltab.ui lookandfeeltab_kcm.h kicker_config_menus.desktop advancedOptions.ui panel.desktop hidingconfig.h positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config_arrangement.desktop kicker_config.desktop menutab.ui menuconfig.h applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp positionconfig.h kicker_config_hiding.desktop Makefile.am 
++KDE_DIST=applettab_impl.h lookandfeeltab.ui lookandfeelconfig.h lookandfeeltab_kcm.h kicker_config_menus.desktop advancedOptions.ui hidingconfig.h panel.desktop positiontab.ui kicker_config_appearance.desktop applettab_impl.cpp kicker_config_arrangement.desktop kicker_config.desktop menutab.ui menuconfig.h applettab.ui Makefile.in hidingtab.ui uninstall.desktop lookandfeeltab_kcm.cpp positionconfig.h kicker_config_hiding.desktop Makefile.am 
  
  #>+ 4
  clean-idl:
+@@ -1160,7 +1168,7 @@
+ 
+ 
+ #>+ 11
+-kcm_kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/positiontab_impl.cpp $(srcdir)/hidingtab_impl.cpp $(srcdir)/lookandfeeltab_impl.cpp $(srcdir)/menutab_impl.cpp $(srcdir)/extensionInfo.cpp  ../../kicker/libkicker/kickerSettings.h $(srcdir)/main.cpp $(srcdir)/advancedDialog.cpp $(srcdir)/positionconfig.cpp $(srcdir)/hidingconfig.cpp $(srcdir)/menuconfig.cpp $(srcdir)/lookandfeelconfig.cpp main_skel.cpp positiontab.cpp hidingtab.cpp lookandfeeltab.cpp menutab.cpp advancedOptions.cpp  menutab_impl.moc lookandfeelconfig.moc positionconfig.moc advancedOptions.moc main.moc menuconfig.moc positiontab.moc hidingtab_impl.moc hidingtab.moc hidingconfig.moc menutab.moc lookandfeeltab.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
++kcm_kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/positiontab_impl.cpp $(srcdir)/hidingtab_impl.cpp $(srcdir)/lookandfeeltab_impl.cpp $(srcdir)/menutab_impl.cpp $(srcdir)/extensionInfo.cpp  ../../kicker/libkicker/kickerSettings.h $(srcdir)/main.cpp $(srcdir)/advancedDialog.cpp $(srcdir)/positionconfig.cpp $(srcdir)/hidingconfig.cpp $(srcdir)/menuconfig.cpp $(srcdir)/lookandfeelconfig.cpp main_skel.cpp positiontab.cpp hidingtab.cpp lookandfeeltab.cpp menutab.cpp advancedOptions.cpp  lookandfeelconfig.moc menutab_impl.moc positionconfig.moc advancedOptions.moc main.moc menuconfig.moc positiontab.moc hidingtab_impl.moc hidingtab.moc hidingconfig.moc menutab.moc lookandfeeltab.moc lookandfeeltab_impl.moc positiontab_impl.moc advancedDialog.moc
+ 	@echo 'creating kcm_kicker_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_kicker_la.all_cpp.files kcm_kicker_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_kicker_la.all_cpp.final; \
+@@ -1217,8 +1225,8 @@
+ $(srcdir)/positiontab_impl.cpp: positiontab.h hidingtab.h lookandfeeltab.h menutab.h advancedOptions.h 
+ lookandfeeltab_kcm.o: lookandfeeltab_kcm.moc 
+ positionconfig.lo: positionconfig.moc 
+-lookandfeelconfig.lo: lookandfeelconfig.moc 
+ applettab_impl.lo: applettab_impl.moc 
++lookandfeelconfig.lo: lookandfeelconfig.moc 
+ main.o: main.moc 
+ lookandfeelconfig.o: lookandfeelconfig.moc 
+ menutab_impl.lo: menutab_impl.moc 
 --- kcontrol/kio/Makefile.in
 +++ kcontrol/kio/Makefile.in
 @@ -182,6 +182,7 @@
@@ -64891,7 +82687,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -326,6 +327,9 @@
+@@ -276,7 +277,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -326,6 +326,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64901,7 +82705,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -376,6 +380,7 @@
+@@ -376,6 +379,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -64909,7 +82713,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -383,12 +388,9 @@
+@@ -383,12 +387,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -64922,7 +82726,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,10 +411,13 @@
+@@ -409,10 +410,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -64936,7 +82740,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -421,6 +426,7 @@
+@@ -421,6 +425,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -64944,7 +82748,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -582,6 +588,7 @@
+@@ -582,6 +587,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -64952,7 +82756,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -589,10 +596,12 @@
+@@ -589,10 +595,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -64965,7 +82769,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -652,7 +661,7 @@
+@@ -652,7 +660,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -64974,7 +82778,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -690,9 +699,9 @@
+@@ -690,9 +698,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -64986,7 +82790,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1178,18 +1187,18 @@
+@@ -1178,18 +1186,18 @@
  mocs: smbrodlg.moc
  
  #>+ 3
@@ -65011,81 +82815,28 @@
  
  #>+ 3
  kproxydlg.moc: $(srcdir)/kproxydlg.h
-@@ -1206,13 +1215,6 @@
- mocs: useragentdlg.moc
+@@ -1263,10 +1271,10 @@
  
  #>+ 3
--main.moc: $(srcdir)/main.h
--	$(MOC) $(srcdir)/main.h -o main.moc
--
--#>+ 2
--mocs: main.moc
--
--#>+ 3
- kcookiesmain.moc: $(srcdir)/kcookiesmain.h
- 	$(MOC) $(srcdir)/kcookiesmain.h -o kcookiesmain.moc
- 
-@@ -1220,11 +1222,11 @@
- mocs: kcookiesmain.moc
- 
- #>+ 3
--kcookiespolicies.moc: $(srcdir)/kcookiespolicies.h
--	$(MOC) $(srcdir)/kcookiespolicies.h -o kcookiespolicies.moc
-+main.moc: $(srcdir)/main.h
-+	$(MOC) $(srcdir)/main.h -o main.moc
- 
- #>+ 2
--mocs: kcookiespolicies.moc
-+mocs: main.moc
- 
- #>+ 3
- kcookiesmanagement.moc: $(srcdir)/kcookiesmanagement.h
-@@ -1234,6 +1236,13 @@
- mocs: kcookiesmanagement.moc
- 
- #>+ 3
-+kcookiespolicies.moc: $(srcdir)/kcookiespolicies.h
-+	$(MOC) $(srcdir)/kcookiespolicies.h -o kcookiespolicies.moc
-+
-+#>+ 2
-+mocs: kcookiespolicies.moc
-+
-+#>+ 3
- netpref.moc: $(srcdir)/netpref.h
- 	$(MOC) $(srcdir)/netpref.h -o netpref.moc
- 
-@@ -1263,10 +1272,10 @@
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  uagentproviderdlg.moc smbrodlg.moc socks.moc kmanualproxydlg.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiespolicies.moc kcookiesmanagement.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
-+	-rm -f  uagentproviderdlg.moc smbrodlg.moc kmanualproxydlg.moc socks.moc kproxydlg.moc useragentdlg.moc kcookiesmain.moc main.moc kcookiesmanagement.moc kcookiespolicies.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
++	-rm -f  uagentproviderdlg.moc smbrodlg.moc kmanualproxydlg.moc socks.moc kproxydlg.moc useragentdlg.moc main.moc kcookiesmain.moc kcookiespolicies.moc kcookiesmanagement.moc netpref.moc policydlg.moc kenvvarproxydlg.moc cache.moc
  
  #>+ 2
 -KDE_DIST=uasprovider.desktop policydlg.h fakeuaprovider.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO useragentdlg.h kio_ftprc.kcfg kioslave.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui cache_ui.ui useragentdlg_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop uagentproviderdlg.h kproxydlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h Makefile.am kcookiesmain.h kmanualproxydlg.h manualproxy_ui.ui 
-+KDE_DIST=uasprovider.desktop fakeuaprovider.h policydlg.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO kio_ftprc.kcfg useragentdlg.h kioslave.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui cache_ui.ui useragentdlg_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop kproxydlg.h uagentproviderdlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h Makefile.am kcookiesmain.h kmanualproxydlg.h manualproxy_ui.ui 
++KDE_DIST=uasprovider.desktop fakeuaprovider.h policydlg.h socks.upd lanbrowser.desktop smb.desktop UA-DESKTOP-FILE-HOWTO kioslave.kcfg useragentdlg.h kio_ftprc.kcfg socksbase.ui netpref.h main.h smbrodlg.h cache.desktop kio_ftprc.kcfgc cookies.desktop kenvvarproxydlg.h ksaveioconfig.h uagentproviderdlg_ui.ui useragentdlg_ui.ui cache_ui.ui netpref.desktop kcookiespolicies.h socks.h proxy.desktop uagentproviderdlg.h kproxydlg.h envvarproxy_ui.ui kproxydlg_ui.ui kioslave.kcfgc policydlg_ui.ui useragent.desktop cache.h Makefile.in kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui kcookiesmanagement.h uninstall.desktop kproxydlgbase.h Makefile.am kcookiesmain.h kmanualproxydlg.h manualproxy_ui.ui 
  
  #>+ 13
  clean-ui:
-@@ -1328,7 +1337,7 @@
+@@ -1328,7 +1336,7 @@
  
  
  #>+ 11
 -kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp  uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc socks.moc kmanualproxydlg.moc useragentdlg.moc main.moc kcookiesmanagement.moc kcookiespolicies.moc cache.moc
-+kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp  uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc kmanualproxydlg.moc socks.moc useragentdlg.moc main.moc kcookiespolicies.moc kcookiesmanagement.moc cache.moc
++kcm_kio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/policydlg.cpp $(srcdir)/kcookiesmain.cpp $(srcdir)/kcookiespolicies.cpp $(srcdir)/main.cpp $(srcdir)/smbrodlg.cpp $(srcdir)/useragentdlg.cpp $(srcdir)/kproxydlgbase.cpp $(srcdir)/kmanualproxydlg.cpp $(srcdir)/kenvvarproxydlg.cpp $(srcdir)/kproxydlg.cpp $(srcdir)/kcookiesmanagement.cpp $(srcdir)/fakeuaprovider.cpp $(srcdir)/uagentproviderdlg.cpp $(srcdir)/netpref.cpp $(srcdir)/cache.cpp $(srcdir)/ksaveioconfig.cpp $(srcdir)/socks.cpp socksbase.cpp kproxydlg_ui.cpp kcookiesmanagementdlg_ui.cpp kcookiespoliciesdlg_ui.cpp policydlg_ui.cpp useragentdlg_ui.cpp uagentproviderdlg_ui.cpp manualproxy_ui.cpp envvarproxy_ui.cpp cache_ui.cpp  uagentproviderdlg.moc smbrodlg.moc manualproxy_ui.moc policydlg_ui.moc kproxydlg.moc socksbase.moc envvarproxy_ui.moc kcookiespoliciesdlg_ui.moc kproxydlg_ui.moc cache_ui.moc uagentproviderdlg_ui.moc kcookiesmain.moc useragentdlg_ui.moc netpref.moc policydlg.moc kenvvarproxydlg.moc kcookiesmanagementdlg_ui.moc kmanualproxydlg.moc socks.moc useragentdlg.moc main.moc kcookiesmanagement.moc kcookiespolicies.moc cache.moc
  	@echo 'creating kcm_kio_la.all_cpp.cpp ...'; \
  	rm -f kcm_kio_la.all_cpp.files kcm_kio_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
-@@ -1368,8 +1377,8 @@
- kmanualproxydlg.lo: kmanualproxydlg.moc 
- $(srcdir)/cache.cpp: socksbase.h kproxydlg_ui.h kcookiesmanagementdlg_ui.h kcookiespoliciesdlg_ui.h policydlg_ui.h useragentdlg_ui.h uagentproviderdlg_ui.h manualproxy_ui.h envvarproxy_ui.h cache_ui.h 
- kcookiespolicies.o: kcookiespolicies.moc 
--kcookiesmain.lo: kcookiesmain.moc 
- main.lo: main.moc 
-+kcookiesmain.lo: kcookiesmain.moc 
- uagentproviderdlg.lo: uagentproviderdlg.moc 
- $(srcdir)/main.cpp: socksbase.h kproxydlg_ui.h kcookiesmanagementdlg_ui.h kcookiespoliciesdlg_ui.h policydlg_ui.h useragentdlg_ui.h uagentproviderdlg_ui.h manualproxy_ui.h envvarproxy_ui.h cache_ui.h 
- $(srcdir)/socks.cpp: socksbase.h kproxydlg_ui.h kcookiesmanagementdlg_ui.h kcookiespoliciesdlg_ui.h policydlg_ui.h useragentdlg_ui.h uagentproviderdlg_ui.h manualproxy_ui.h envvarproxy_ui.h cache_ui.h 
 --- kcontrol/kio/uasproviders/Makefile.in
 +++ kcontrol/kio/uasproviders/Makefile.in
 @@ -117,6 +117,7 @@
@@ -65096,7 +82847,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65106,7 +82865,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65114,7 +82873,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -65127,7 +82886,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -65141,7 +82900,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -65149,7 +82908,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -65157,7 +82916,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -65170,7 +82929,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -564,7 +573,7 @@
+@@ -564,7 +572,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -65179,7 +82938,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +611,9 @@
+@@ -602,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65191,6 +82950,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -764,7 +772,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=ns71oncurrent.desktop mozoncurrent.desktop mozoncurrent16.desktop nn476onppc.desktop op403onwinnt4.desktop w3moncurrent.desktop nn475onwin95.desktop ie60onwinnt51.desktop ie55onwin98.desktop googlebot.desktop safari.desktop ie45onwinnt5.desktop wgetoncurrent.desktop firefoxoncurrent.desktop nn475oncurrent.desktop lynxoncurrent.desktop ie501onwinnt5.desktop ns71onwinnt51.desktop ie60oncurrent.desktop ie55onwinnt5.desktop Makefile.in mozonwin2000.desktop ie401onwinnt4.desktop ie50onppc.desktop op75oncurrent.desktop mozonwinxp.desktop nn301oncurrent.desktop Makefile.am mozoncurrent12.desktop 
++KDE_DIST=ns71oncurrent.desktop mozoncurrent.desktop mozoncurrent16.desktop nn476onppc.desktop op403onwinnt4.desktop w3moncurrent.desktop nn475onwin95.desktop ie60onwinnt51.desktop ie55onwin98.desktop googlebot.desktop safari.desktop ie45onwinnt5.desktop wgetoncurrent.desktop firefoxoncurrent.desktop nn475oncurrent.desktop lynxoncurrent.desktop ie501onwinnt5.desktop ns71onwinnt51.desktop ie55onwinnt5.desktop ie60oncurrent.desktop Makefile.in mozonwin2000.desktop ie401onwinnt4.desktop ie50onppc.desktop op75oncurrent.desktop mozonwinxp.desktop nn301oncurrent.desktop mozoncurrent12.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
 --- kcontrol/knotify/Makefile.in
 +++ kcontrol/knotify/Makefile.in
 @@ -171,6 +171,7 @@
@@ -65201,7 +82969,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -315,6 +316,9 @@
+@@ -265,7 +266,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -315,6 +315,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65211,7 +82987,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -365,6 +369,7 @@
+@@ -365,6 +368,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65219,7 +82995,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -372,12 +377,9 @@
+@@ -372,12 +376,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -65232,7 +83008,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -398,10 +400,13 @@
+@@ -398,10 +399,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -65246,7 +83022,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -410,6 +415,7 @@
+@@ -410,6 +414,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -65254,7 +83030,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -571,6 +577,7 @@
+@@ -571,6 +576,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -65262,7 +83038,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -578,10 +585,12 @@
+@@ -578,10 +584,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -65275,7 +83051,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -622,7 +631,7 @@
+@@ -622,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65284,7 +83060,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +669,9 @@
+@@ -660,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65306,7 +83082,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65316,7 +83100,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65324,7 +83108,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -65337,7 +83121,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -65351,7 +83135,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -65359,7 +83143,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -65367,7 +83151,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -65380,7 +83164,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -664,7 +673,7 @@
+@@ -664,7 +672,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -65389,7 +83173,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -702,9 +711,9 @@
+@@ -702,9 +710,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65401,15 +83185,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -864,7 +873,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=KDE_Beep_Pop.wav KDE_Beep_RimShot.wav KDE_Window_Shade_Up.wav KDE_Beep_Beep.wav KDE_Desktop3.wav KDE_Beep_Door.wav KDE_Window_UnSticky.wav KDE_Window_Maximize.wav KDE_Beep_ClassicBeep.wav KDE_Beep_Ahem.wav KDE_Beep_Bottles.wav KDE_Window_Open.wav KDE_Dialog_Disappear.wav KDE_Beep_ShortBeep.wav KDE_Error.wav KDE_Window_DeIconify.wav KDE_Critical_Error.wav KDE_Window_Iconify.wav KDE_Beep_Yo.wav KDE_Window_Sticky.wav KDE_Notify.wav KDE_Desktop2.wav KDE_Window_Close.wav KDE_Desktop1.wav KDE_Beep_Lightning.wav KDE_Desktop6.wav KDE_Desktop4.wav KDE_Window_UnMaximize.wav KDE_Desktop5.wav KDE_Beep_Connect.wav Makefile.in KDE_Beep_ClockChime.wav KDE_Window_Shade_Down.wav KDE_Beep_Honk.wav KDE_Click.wav KDE_Logout.wav KDE_Close_Window.wav KDE_Dialog_Appear.wav Makefile.am KDE_Startup.wav KDE_Beep_RingRing.wav KDE_Desktop7.wav KDE_Desktop8.wav 
-+KDE_DIST=KDE_Beep_Pop.wav KDE_Beep_RimShot.wav KDE_Window_Shade_Up.wav KDE_Beep_Beep.wav KDE_Desktop3.wav KDE_Beep_Door.wav KDE_Window_UnSticky.wav KDE_Beep_ClassicBeep.wav KDE_Window_Maximize.wav KDE_Beep_Ahem.wav KDE_Beep_Bottles.wav KDE_Window_Open.wav KDE_Dialog_Disappear.wav KDE_Beep_ShortBeep.wav KDE_Error.wav KDE_Window_DeIconify.wav KDE_Critical_Error.wav KDE_Window_Iconify.wav KDE_Beep_Yo.wav KDE_Window_Sticky.wav KDE_Notify.wav KDE_Window_Close.wav KDE_Desktop2.wav KDE_Desktop1.wav KDE_Beep_Lightning.wav KDE_Desktop6.wav KDE_Window_UnMaximize.wav KDE_Desktop4.wav KDE_Desktop5.wav KDE_Beep_Connect.wav Makefile.in KDE_Beep_ClockChime.wav KDE_Window_Shade_Down.wav KDE_Beep_Honk.wav KDE_Click.wav KDE_Logout.wav KDE_Close_Window.wav KDE_Dialog_Appear.wav Makefile.am KDE_Startup.wav KDE_Beep_RingRing.wav KDE_Desktop7.wav KDE_Desktop8.wav 
- 
- #>+ 2
- docs-am:
 --- kcontrol/konq/Makefile.in
 +++ kcontrol/konq/Makefile.in
 @@ -161,6 +161,7 @@
@@ -65420,7 +83195,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -305,6 +306,9 @@
+@@ -255,7 +256,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65430,7 +83213,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -355,6 +359,7 @@
+@@ -355,6 +358,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65438,7 +83221,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -362,12 +367,9 @@
+@@ -362,12 +366,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -65451,7 +83234,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -388,10 +390,13 @@
+@@ -388,10 +389,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -65465,7 +83248,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -400,6 +405,7 @@
+@@ -400,6 +404,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -65473,7 +83256,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -561,6 +567,7 @@
+@@ -561,6 +566,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -65481,7 +83264,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -568,10 +575,12 @@
+@@ -568,10 +574,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -65494,7 +83277,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -622,7 +631,7 @@
+@@ -622,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65503,7 +83286,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +669,9 @@
+@@ -660,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65515,49 +83298,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1031,18 +1040,18 @@
- mocs: desktopbehavior_impl.moc
+@@ -1056,7 +1064,7 @@
+ 	-rm -f  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
  
- #>+ 3
--browser.moc: $(srcdir)/browser.h
--	$(MOC) $(srcdir)/browser.h -o browser.moc
-+desktop.moc: $(srcdir)/desktop.h
-+	$(MOC) $(srcdir)/desktop.h -o desktop.moc
- 
  #>+ 2
--mocs: browser.moc
-+mocs: desktop.moc
+-KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h filepreviews.desktop desktop.h previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop Makefile.am desktop.desktop 
++KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h desktop.h filepreviews.desktop previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop desktop.desktop Makefile.am 
  
- #>+ 3
--desktop.moc: $(srcdir)/desktop.h
--	$(MOC) $(srcdir)/desktop.h -o desktop.moc
-+browser.moc: $(srcdir)/browser.h
-+	$(MOC) $(srcdir)/browser.h -o browser.moc
- 
- #>+ 2
--mocs: desktop.moc
-+mocs: browser.moc
- 
- #>+ 3
- rootopts.moc: $(srcdir)/rootopts.h
-@@ -1053,7 +1062,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
-+	-rm -f  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc desktop.moc browser.moc rootopts.moc
- 
- #>+ 2
- KDE_DIST=onlyone.png fontopts.h browser.h desktopbehavior.ui overlapping.png fileappearance.desktop webbehavior.desktop filebehavior.desktop desktopbehavior_impl.h filepreviews.desktop desktop.h previews.h webappearance.desktop rootopts.h desktoppath.desktop behaviour.h filebrowser.desktop Makefile.in desktopbehavior.desktop Makefile.am desktop.desktop 
-@@ -1114,7 +1123,7 @@
- 
- 
- #>+ 11
--kcm_konq_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/behaviour.cpp $(srcdir)/desktop.cpp $(srcdir)/rootopts.cpp $(srcdir)/fontopts.cpp $(srcdir)/previews.cpp $(srcdir)/browser.cpp $(srcdir)/main.cpp $(srcdir)/desktopbehavior_impl.cpp uiserver_stub.cpp desktopbehavior.cpp  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc desktop.moc browser.moc desktopbehavior.moc rootopts.moc
-+kcm_konq_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/behaviour.cpp $(srcdir)/desktop.cpp $(srcdir)/rootopts.cpp $(srcdir)/fontopts.cpp $(srcdir)/previews.cpp $(srcdir)/browser.cpp $(srcdir)/main.cpp $(srcdir)/desktopbehavior_impl.cpp uiserver_stub.cpp desktopbehavior.cpp  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc desktopbehavior.moc rootopts.moc
- 	@echo 'creating kcm_konq_la.all_cpp.cpp ...'; \
- 	rm -f kcm_konq_la.all_cpp.files kcm_konq_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_konq_la.all_cpp.final; \
+ #>+ 4
+ clean-idl:
 --- kcontrol/konqhtml/Makefile.in
 +++ kcontrol/konqhtml/Makefile.in
 @@ -158,6 +158,7 @@
@@ -65568,7 +83317,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65578,7 +83335,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65586,7 +83343,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -65599,7 +83356,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -65613,7 +83370,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -65621,7 +83378,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -65629,7 +83386,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -65642,7 +83399,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -617,7 +626,7 @@
+@@ -617,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65651,7 +83408,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +664,9 @@
+@@ -655,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65663,7 +83420,35 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1035,25 +1044,25 @@
+@@ -986,13 +994,6 @@
+ mocs: jspolicies.moc
+ 
+ #>+ 3
+-appearance.moc: $(srcdir)/appearance.h
+-	$(MOC) $(srcdir)/appearance.h -o appearance.moc
+-
+-#>+ 2
+-mocs: appearance.moc
+-
+-#>+ 3
+ main.moc: $(srcdir)/main.h
+ 	$(MOC) $(srcdir)/main.h -o main.moc
+ 
+@@ -1007,6 +1008,13 @@
+ mocs: jsopts.moc
+ 
+ #>+ 3
++appearance.moc: $(srcdir)/appearance.h
++	$(MOC) $(srcdir)/appearance.h -o appearance.moc
++
++#>+ 2
++mocs: appearance.moc
++
++#>+ 3
+ javaopts.moc: $(srcdir)/javaopts.h
+ 	$(MOC) $(srcdir)/javaopts.h -o javaopts.moc
+ 
+@@ -1035,22 +1043,22 @@
  mocs: advancedTabDialog.moc
  
  #>+ 3
@@ -65689,20 +83474,16 @@
  #>+ 3
  clean-metasources:
 -	-rm -f  khttpoptdlg.moc filteropts.moc jspolicies.moc appearance.moc main.moc jsopts.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
-+	-rm -f  khttpoptdlg.moc filteropts.moc jspolicies.moc appearance.moc main.moc jsopts.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
++	-rm -f  khttpoptdlg.moc filteropts.moc jspolicies.moc main.moc jsopts.moc appearance.moc javaopts.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
  
  #>+ 2
--KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h khtml_filter.desktop main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h filteropts.h khttpoptdlg.h javaopts.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am 
-+KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h khtml_filter.desktop main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h filteropts.h javaopts.h khttpoptdlg.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am 
+ KDE_DIST=policydlg.h policies.h pluginopts.h appearance.h khtml_filter.desktop main.h jsopts.h advancedTabDialog.h advancedTabOptions.ui khtml_java_js.desktop nsconfigwidget.ui htmlopts.h filteropts.h khttpoptdlg.h javaopts.h jspolicies.h domainlistview.h khtml_behavior.desktop khtml_fonts.desktop Makefile.in uninstall.desktop Makefile.am 
+@@ -1107,7 +1115,7 @@
  
- #>+ 5
- clean-ui:
-@@ -1107,7 +1116,7 @@
  
- 
  #>+ 11
 -kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp $(srcdir)/filteropts.cpp nsconfigwidget.cpp advancedTabOptions.cpp  khttpoptdlg.moc jspolicies.moc filteropts.moc jsopts.moc main.moc appearance.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc htmlopts.moc pluginopts.moc
-+kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp $(srcdir)/filteropts.cpp nsconfigwidget.cpp advancedTabOptions.cpp  khttpoptdlg.moc jspolicies.moc filteropts.moc jsopts.moc main.moc appearance.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
++kcm_konqhtml_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/advancedTabDialog.cpp $(srcdir)/htmlopts.cpp $(srcdir)/jsopts.cpp $(srcdir)/javaopts.cpp $(srcdir)/pluginopts.cpp $(srcdir)/appearance.cpp $(srcdir)/khttpoptdlg.cpp $(srcdir)/policydlg.cpp $(srcdir)/main.cpp $(srcdir)/jspolicies.cpp $(srcdir)/policies.cpp $(srcdir)/domainlistview.cpp $(srcdir)/filteropts.cpp nsconfigwidget.cpp advancedTabOptions.cpp  khttpoptdlg.moc jspolicies.moc filteropts.moc appearance.moc jsopts.moc main.moc javaopts.moc nsconfigwidget.moc advancedTabOptions.moc policydlg.moc domainlistview.moc advancedTabDialog.moc pluginopts.moc htmlopts.moc
  	@echo 'creating kcm_konqhtml_la.all_cpp.cpp ...'; \
  	rm -f kcm_konqhtml_la.all_cpp.files kcm_konqhtml_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
@@ -65716,7 +83497,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65726,7 +83515,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65734,7 +83523,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -65747,7 +83536,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -65761,7 +83550,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -65769,7 +83558,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -65777,7 +83566,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -65790,7 +83579,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -610,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -65799,7 +83588,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -648,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65821,7 +83610,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -265,6 +266,9 @@
+@@ -215,7 +216,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -265,6 +265,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65831,7 +83628,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -315,6 +319,7 @@
+@@ -315,6 +318,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65839,7 +83636,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -322,12 +327,9 @@
+@@ -322,12 +326,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -65852,7 +83649,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -348,10 +350,13 @@
+@@ -348,10 +349,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -65866,7 +83663,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -360,6 +365,7 @@
+@@ -360,6 +364,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -65874,7 +83671,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -521,6 +527,7 @@
+@@ -521,6 +526,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -65882,7 +83679,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -528,10 +535,12 @@
+@@ -528,10 +534,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -65895,7 +83692,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -564,7 +573,7 @@
+@@ -564,7 +572,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -65904,7 +83701,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +611,9 @@
+@@ -602,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -65916,12 +83713,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
-@@ -785,7 +794,7 @@
+@@ -785,7 +793,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad Xdvi.ad krdb AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad Makefile.in XOsview.ad WPerfect.ad Editres.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am 
-+KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad krdb Xdvi.ad AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad Makefile.in XOsview.ad Editres.ad WPerfect.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am 
++KDE_DIST=AAAXaw.ad AAATk.ad XTerm.ad AAAAAAGeneral.ad Xdvi.ad krdb AAAMotif.ad Netscape.ad XCalc.ad ML.ad RVPlayer.ad XV.ad Xawtv.ad Nedit.ad XOsview.ad Makefile.in WPerfect.ad Editres.ad Emacs.ad GV.ad Xpdf.ad AcroRead.ad Makefile.am 
  
  #>+ 2
  docs-am:
@@ -65935,7 +83732,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65945,7 +83750,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -65953,7 +83758,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -65966,7 +83771,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -65980,7 +83785,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -65988,7 +83793,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -65996,7 +83801,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -66009,7 +83814,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -562,7 +571,7 @@
+@@ -562,7 +570,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -66018,7 +83823,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +609,9 @@
+@@ -600,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66030,12 +83835,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -764,7 +773,7 @@
+@@ -764,7 +772,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc Pumpkin.kcsrc MediaPeach.kcsrc DarkBlue.kcsrc KDEOne.kcsrc DesertRed.kcsrc Keramik.kcsrc WindowsXP.kcsrc BlackOnWhite.kcsrc BeOS.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc Windows95.kcsrc CDE.kcsrc YellowOnBlue.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am 
-+KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc Pumpkin.kcsrc MediaPeach.kcsrc DarkBlue.kcsrc DesertRed.kcsrc KDEOne.kcsrc Keramik.kcsrc WindowsXP.kcsrc BeOS.kcsrc BlackOnWhite.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc YellowOnBlue.kcsrc CDE.kcsrc Windows95.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am 
++KDE_DIST=KDETwo.kcsrc PaleGray.kcsrc Next.kcsrc SolarisCDE.kcsrc PointReyesGreen.kcsrc AtlasGreen.kcsrc EveX.kcsrc Storm.kcsrc MediaPeach.kcsrc Pumpkin.kcsrc DarkBlue.kcsrc DesertRed.kcsrc KDEOne.kcsrc Keramik.kcsrc WindowsXP.kcsrc BlackOnWhite.kcsrc BeOS.kcsrc System.kcsrc WhiteOnBlack.kcsrc Makefile.in KeramikEmerald.kcsrc DigitalCDE.kcsrc Windows2000.kcsrc BlueSlate.kcsrc CDE.kcsrc Windows95.kcsrc YellowOnBlue.kcsrc KeramikWhite.kcsrc Plastik.kcsrc Makefile.am 
  
  #>+ 2
  docs-am:
@@ -66049,7 +83854,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -306,6 +307,9 @@
+@@ -256,7 +257,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66059,7 +83872,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,6 +360,7 @@
+@@ -356,6 +359,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66067,7 +83880,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -363,12 +368,9 @@
+@@ -363,12 +367,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -66080,7 +83893,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -389,10 +391,13 @@
+@@ -389,10 +390,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -66094,7 +83907,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -401,6 +406,7 @@
+@@ -401,6 +405,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -66102,7 +83915,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -562,6 +568,7 @@
+@@ -562,6 +567,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -66110,7 +83923,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -569,10 +576,12 @@
+@@ -569,10 +575,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -66123,7 +83936,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -608,7 +617,7 @@
+@@ -608,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -66132,7 +83945,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +655,9 @@
+@@ -646,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66154,7 +83967,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66164,7 +83985,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66172,7 +83993,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -66185,7 +84006,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -66199,7 +84020,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -66207,7 +84028,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -66215,7 +84036,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -66228,7 +84049,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -66237,7 +84058,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66259,7 +84080,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66269,7 +84098,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66277,7 +84106,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -66290,7 +84119,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -66304,7 +84133,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -66312,7 +84141,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -66320,7 +84149,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -66333,7 +84162,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -66342,7 +84171,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66364,7 +84193,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66374,7 +84211,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66382,7 +84219,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -66395,7 +84232,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -66409,7 +84246,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -66417,7 +84254,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -66425,7 +84262,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -66438,7 +84275,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -66447,7 +84284,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66469,7 +84306,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66479,7 +84324,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66487,7 +84332,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -66500,7 +84345,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -66514,7 +84359,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -66522,7 +84367,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -66530,7 +84375,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -66543,7 +84388,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -66552,7 +84397,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66574,7 +84419,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66584,7 +84437,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66592,7 +84445,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -66605,7 +84458,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -66619,7 +84472,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -66627,7 +84480,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -66635,7 +84488,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -66648,7 +84501,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -66657,7 +84510,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66679,7 +84532,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66689,7 +84550,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66697,7 +84558,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -66710,7 +84571,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -66724,7 +84585,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -66732,7 +84593,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -66740,7 +84601,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -66753,7 +84614,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -66762,7 +84623,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66784,7 +84645,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66794,7 +84663,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66802,7 +84671,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -66815,7 +84684,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -66829,7 +84698,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -66837,7 +84706,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -66845,7 +84714,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -66858,7 +84727,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -66867,7 +84736,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66889,7 +84758,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66899,7 +84776,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -66907,7 +84784,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -66920,7 +84797,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -66934,7 +84811,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -66942,7 +84819,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -66950,7 +84827,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -66963,7 +84840,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -563,7 +572,7 @@
+@@ -563,7 +571,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -66972,7 +84849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +610,9 @@
+@@ -601,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -66994,7 +84871,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67004,7 +84889,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67012,7 +84897,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -67025,7 +84910,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -67039,7 +84924,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -67047,7 +84932,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -67055,7 +84940,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -67068,7 +84953,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -67077,7 +84962,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67099,7 +84984,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67109,7 +85002,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67117,7 +85010,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -67130,7 +85023,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -67144,7 +85037,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -67152,7 +85045,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -67160,7 +85053,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -67173,7 +85066,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -67182,7 +85075,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67204,7 +85097,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67214,7 +85115,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67222,7 +85123,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -67235,7 +85136,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -67249,7 +85150,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -67257,7 +85158,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -67265,7 +85166,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -67278,7 +85179,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -67287,7 +85188,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67309,7 +85210,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67319,7 +85228,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67327,7 +85236,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -67340,7 +85249,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -67354,7 +85263,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -67362,7 +85271,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -67370,7 +85279,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -67383,7 +85292,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -67392,7 +85301,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67414,7 +85323,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67424,7 +85341,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67432,7 +85349,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -67445,7 +85362,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -67459,7 +85376,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -67467,7 +85384,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -67475,7 +85392,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -67488,7 +85405,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -67497,7 +85414,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67519,7 +85436,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67529,7 +85454,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67537,7 +85462,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -67550,7 +85475,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -67564,7 +85489,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -67572,7 +85497,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -67580,7 +85505,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -67593,7 +85518,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -67602,7 +85527,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67624,7 +85549,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -306,6 +307,9 @@
+@@ -256,7 +257,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67634,7 +85567,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -356,6 +360,7 @@
+@@ -356,6 +359,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67642,7 +85575,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -363,12 +368,9 @@
+@@ -363,12 +367,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -67655,7 +85588,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -389,10 +391,13 @@
+@@ -389,10 +390,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -67669,7 +85602,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -401,6 +406,7 @@
+@@ -401,6 +405,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -67677,7 +85610,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -562,6 +568,7 @@
+@@ -562,6 +567,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -67685,7 +85618,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -569,10 +576,12 @@
+@@ -569,10 +575,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -67698,7 +85631,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -613,7 +622,7 @@
+@@ -613,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67707,7 +85640,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +660,9 @@
+@@ -651,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67729,7 +85662,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67739,7 +85680,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67747,7 +85688,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -67760,7 +85701,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -67774,7 +85715,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -67782,7 +85723,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -67790,7 +85731,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -67803,7 +85744,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -597,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -67812,7 +85753,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -635,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67834,7 +85775,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67844,7 +85793,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67852,7 +85801,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -67865,7 +85814,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -67879,7 +85828,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -67887,7 +85836,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -67895,7 +85844,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -67908,7 +85857,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -67917,7 +85866,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -67939,7 +85888,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -320,6 +321,9 @@
+@@ -270,7 +271,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -320,6 +320,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67949,7 +85906,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -370,6 +374,7 @@
+@@ -370,6 +373,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -67957,7 +85914,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -377,12 +382,9 @@
+@@ -377,12 +381,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -67970,7 +85927,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,10 +405,13 @@
+@@ -403,10 +404,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -67984,7 +85941,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -415,6 +420,7 @@
+@@ -415,6 +419,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -67992,7 +85949,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -576,6 +582,7 @@
+@@ -576,6 +581,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -68000,7 +85957,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -583,10 +590,12 @@
+@@ -583,10 +589,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -68013,7 +85970,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -623,7 +632,7 @@
+@@ -623,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -68022,7 +85979,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +670,9 @@
+@@ -661,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68034,49 +85991,51 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1089,13 +1098,6 @@
+@@ -1089,11 +1097,11 @@
  mocs: klocalesample.moc
  
  #>+ 3
 -localeother.moc: $(srcdir)/localeother.h
 -	$(MOC) $(srcdir)/localeother.h -o localeother.moc
--
--#>+ 2
++toplevel.moc: $(srcdir)/toplevel.h
++	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+ 
+ #>+ 2
 -mocs: localeother.moc
--
--#>+ 3
++mocs: toplevel.moc
+ 
+ #>+ 3
  localemon.moc: $(srcdir)/localemon.h
- 	$(MOC) $(srcdir)/localemon.h -o localemon.moc
+@@ -1103,11 +1111,11 @@
+ mocs: localemon.moc
  
-@@ -1110,6 +1112,13 @@
- mocs: toplevel.moc
- 
  #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+-	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
 +localeother.moc: $(srcdir)/localeother.h
 +	$(MOC) $(srcdir)/localeother.h -o localeother.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: toplevel.moc
 +mocs: localeother.moc
-+
-+#>+ 3
+ 
+ #>+ 3
  kcmlocale.moc: $(srcdir)/kcmlocale.h
- 	$(MOC) $(srcdir)/kcmlocale.h -o kcmlocale.moc
+@@ -1125,7 +1133,7 @@
  
-@@ -1125,7 +1134,7 @@
- 
  #>+ 3
  clean-metasources:
 -	-rm -f  localetime.moc klocalesample.moc localeother.moc localemon.moc toplevel.moc kcmlocale.moc localenum.moc
-+	-rm -f  localetime.moc klocalesample.moc localemon.moc toplevel.moc localeother.moc kcmlocale.moc localenum.moc
++	-rm -f  localetime.moc klocalesample.moc toplevel.moc localemon.moc localeother.moc kcmlocale.moc localenum.moc
  
  #>+ 2
  KDE_DIST=TIMEZONES language.desktop Makefile.in Makefile.am 
-@@ -1176,7 +1185,7 @@
+@@ -1176,7 +1184,7 @@
  
  
  #>+ 11
 -kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp  localetime.moc klocalesample.moc toplevel.moc localemon.moc localeother.moc kcmlocale.moc localenum.moc
-+kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp  localetime.moc klocalesample.moc localeother.moc toplevel.moc localemon.moc kcmlocale.moc localenum.moc
++kcm_locale_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/kcmlocale.cpp $(srcdir)/klocalesample.cpp $(srcdir)/localenum.cpp $(srcdir)/localemon.cpp $(srcdir)/localetime.cpp $(srcdir)/localeother.cpp  localetime.moc klocalesample.moc localeother.moc localemon.moc toplevel.moc kcmlocale.moc localenum.moc
  	@echo 'creating kcm_locale_la.all_cpp.cpp ...'; \
  	rm -f kcm_locale_la.all_cpp.files kcm_locale_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_locale_la.all_cpp.final; \
@@ -68090,7 +86049,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68100,7 +86067,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -68108,7 +86075,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -68121,7 +86088,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -68135,7 +86102,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -68143,7 +86110,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -68151,7 +86118,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -68164,7 +86131,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -68173,7 +86140,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68195,7 +86162,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -273,6 +274,9 @@
+@@ -223,7 +224,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -273,6 +273,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68205,7 +86180,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -323,6 +327,7 @@
+@@ -323,6 +326,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -68213,7 +86188,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -330,12 +335,9 @@
+@@ -330,12 +334,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -68226,7 +86201,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -356,10 +358,13 @@
+@@ -356,10 +357,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -68240,7 +86215,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -368,6 +373,7 @@
+@@ -368,6 +372,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -68248,7 +86223,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -529,6 +535,7 @@
+@@ -529,6 +534,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -68256,7 +86231,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -536,10 +543,12 @@
+@@ -536,10 +542,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -68269,7 +86244,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -583,7 +592,7 @@
+@@ -583,7 +591,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -68278,7 +86253,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +630,9 @@
+@@ -621,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68300,7 +86275,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -294,6 +295,9 @@
+@@ -244,7 +245,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68310,7 +86293,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,6 +348,7 @@
+@@ -344,6 +347,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -68318,7 +86301,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -351,12 +356,9 @@
+@@ -351,12 +355,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -68331,7 +86314,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,10 +379,13 @@
+@@ -377,10 +378,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -68345,7 +86328,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -389,6 +394,7 @@
+@@ -389,6 +393,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -68353,7 +86336,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -550,6 +556,7 @@
+@@ -550,6 +555,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -68361,7 +86344,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -557,10 +564,12 @@
+@@ -557,10 +563,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -68374,7 +86357,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -595,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -68383,7 +86366,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -633,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68405,7 +86388,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -303,6 +304,9 @@
+@@ -253,7 +254,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68415,7 +86406,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -68423,7 +86414,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -360,12 +365,9 @@
+@@ -360,12 +364,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -68436,7 +86427,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -386,10 +388,13 @@
+@@ -386,10 +387,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -68450,7 +86441,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -398,6 +403,7 @@
+@@ -398,6 +402,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -68458,7 +86449,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -559,6 +565,7 @@
+@@ -559,6 +564,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -68466,7 +86457,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -566,10 +573,12 @@
+@@ -566,10 +572,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -68479,7 +86470,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -610,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -68488,7 +86479,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -648,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68500,49 +86491,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -962,18 +971,18 @@
- 
- 
- #>+ 3
--konqueror.moc: $(srcdir)/konqueror.h
--	$(MOC) $(srcdir)/konqueror.h -o konqueror.moc
-+system.moc: $(srcdir)/system.h
-+	$(MOC) $(srcdir)/system.h -o system.moc
- 
- #>+ 2
--mocs: konqueror.moc
-+mocs: system.moc
- 
- #>+ 3
--system.moc: $(srcdir)/system.h
--	$(MOC) $(srcdir)/system.h -o system.moc
-+konqueror.moc: $(srcdir)/konqueror.h
-+	$(MOC) $(srcdir)/konqueror.h -o konqueror.moc
- 
- #>+ 2
--mocs: system.moc
-+mocs: konqueror.moc
- 
- #>+ 3
- kcmperformance.moc: $(srcdir)/kcmperformance.h
-@@ -984,7 +993,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  konqueror.moc system.moc kcmperformance.moc
-+	-rm -f  system.moc konqueror.moc kcmperformance.moc
- 
- #>+ 2
- KDE_DIST=kcmperformance.h kcmperformance.desktop konqueror_ui.ui system_ui.ui Makefile.in kcmkonqyperformance.desktop Makefile.am 
-@@ -1041,7 +1050,7 @@
- 
- 
- #>+ 11
--kcm_performance_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmperformance.cpp $(srcdir)/konqueror.cpp $(srcdir)/system.cpp konqueror_ui.cpp system_ui.cpp  system_ui.moc system.moc konqueror.moc kcmperformance.moc konqueror_ui.moc
-+kcm_performance_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmperformance.cpp $(srcdir)/konqueror.cpp $(srcdir)/system.cpp konqueror_ui.cpp system_ui.cpp  system_ui.moc konqueror.moc system.moc kcmperformance.moc konqueror_ui.moc
- 	@echo 'creating kcm_performance_la.all_cpp.cpp ...'; \
- 	rm -f kcm_performance_la.all_cpp.files kcm_performance_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_performance_la.all_cpp.final; \
 --- kcontrol/pics/Makefile.in
 +++ kcontrol/pics/Makefile.in
 @@ -107,6 +107,7 @@
@@ -68553,7 +86501,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68563,7 +86519,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -68571,7 +86527,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -68584,7 +86540,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -68598,7 +86554,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -68606,7 +86562,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -68614,7 +86570,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -68627,7 +86583,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -543,7 +552,7 @@
+@@ -543,7 +551,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -68636,7 +86592,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +590,9 @@
+@@ -581,9 +589,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -68648,12 +86604,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,581 +735,581 @@
+@@ -726,581 +734,581 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr22-app-arts.png cr64-app-locale.png cr48-app-kcmx.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png cr48-app-input_devices_settings.png crsc-app-samba.svgz cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr48-app-multimedia.png cr22-app-hwinfo.png cr32-app-kcmx.png cr48-app-date.png cr48-app-bell.png cr32-app-style.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr64-app-hwinfo.png cr48-app-key_bindings.png cr22-app-energy.png cr128-app-fonts.png cr16-app-iconthemes.png cr16-app-energy_star.png cr16-device-laptop.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr48-app-colors.png cr64-app-kcmpci.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr128-device-laptop.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr128-app-proxy.png cr32-app-date.png cr32-app-ieee1394.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr32-app-keyboard_layout.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr48-app-usb.png cr32-app-enhanced_browsing.png cr128-app-energy.png cr128-app-kdmconfig.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr32-app-kcmkwm.png cr48-app-access.png cr22-app-bell.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr22-app-kcmkwm.png cr32-app-kscreensaver.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr48-app-kthememgr.png cr128-app-bell.png cr32-app-colors.png cr64-device-laptop.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr64-app-ieee1394.png cr16-app-proxy.png cr64-app-energy_star.png cr16-app-hwinfo.png cr64-app-background.png cr22-app-kthememgr.png cr32-app-kcmpartitions.png cr22-app-background.png cr128-app-kcmmemory.png cr22-app-date.png cr32-app-arts.png cr16-app-bell.png cr48-app-agent.png cr48-app-kcmsystem.png cr32-app-kcmsystem.png cr48-device-laptop.png cr48-app-looknfeel.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png crsc-app-kcmkwm.svgz cr32-app-kcmkicker.png cr22-app-personal.png cr48-app-kscreensaver.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr128-app-kcmdevices.png cr16-app-personal.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr16-app-ieee1394.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png crsc-app-ieee1394.svgz cr128-app-cache.png cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr64-app-bell.png cr128-app-date.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr48-app-samba.png cr64-app-kcmdf.png cr22-app-access.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr48-app-background.png cr128-app-personal.png cr48-app-knotify.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr22-app-ieee1394.png cr48-app-ieee1394.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png crsc-device-laptop.svgz cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png cr32-device-laptop.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr22-device-laptop.png cr32-app-access.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr22-app-fonts.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am 
-+KDE_DIST=cr32-app-input_devices_settings.png cr48-app-stylesheet.png cr64-app-kcmx.png cr22-app-arts.png cr64-app-locale.png cr48-app-kcmx.png cr128-app-kcmpartitions.png cr16-app-kcmmemory.png cr32-app-background.png crsc-app-samba.svgz cr48-app-input_devices_settings.png cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr48-app-multimedia.png cr22-app-hwinfo.png cr32-app-kcmx.png cr32-app-style.png cr48-app-bell.png cr48-app-date.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr64-app-hwinfo.png cr48-app-key_bindings.png cr22-app-energy.png cr16-app-iconthemes.png cr128-app-fonts.png cr16-app-energy_star.png cr16-device-laptop.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr48-app-colors.png cr64-app-kcmpci.png cr48-app-energy_star.png cr64-app-energy.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-access.svgz crsc-app-energy.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png crsc-app-filetypes.svgz cr128-app-kcmkwm.png cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr128-device-laptop.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr128-app-proxy.png cr32-app-date.png cr32-app-ieee1394.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr32-app-keyboard_layout.png cr128-app-kcmdf.png cr22-app-kcmx.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr32-app-enhanced_browsing.png cr48-app-usb.png cr128-app-kdmconfig.png cr128-app-energy.png cr128-app-clock.png cr48-app-energy.png cr22-app-style.png cr32-app-agent.png cr64-app-kcmmemory.png cr32-app-kcmprocessor.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr22-app-bell.png cr32-app-kcmkwm.png cr48-app-access.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr22-app-kcmkwm.png cr32-app-kscreensaver.png cr32-app-kdmconfig.png cr22-app-proxy.png cr22-app-kdmconfig.png cr16-app-date.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr128-app-bell.png cr48-app-kthememgr.png cr32-app-colors.png cr64-device-laptop.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr64-app-ieee1394.png cr16-app-proxy.png cr16-app-hwinfo.png cr64-app-energy_star.png cr64-app-background.png cr22-app-kthememgr.png cr32-app-kcmpartitions.png cr22-app-background.png cr22-app-date.png cr128-app-kcmmemory.png cr16-app-bell.png cr32-app-arts.png cr48-app-agent.png cr48-app-kcmsystem.png cr32-app-kcmsystem.png cr48-app-looknfeel.png cr48-device-laptop.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png crsc-app-kcmkwm.svgz cr32-app-kcmkicker.png cr48-app-kscreensaver.png cr22-app-personal.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr128-app-kcmdevices.png cr16-app-personal.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr16-app-ieee1394.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png crsc-app-ieee1394.svgz cr128-app-cache.png cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr128-app-date.png cr64-app-bell.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr64-app-kcmdf.png cr48-app-samba.png cr22-app-access.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr48-app-knotify.png cr128-app-personal.png cr48-app-background.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr22-app-ieee1394.png cr48-app-ieee1394.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png crsc-device-laptop.svgz cr16-app-usb.png cr64-app-kcmdevices.png cr22-app-cookie.png cr48-app-hwinfo.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png cr32-device-laptop.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr32-app-access.png cr22-device-laptop.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr16-app-kthememgr.png cr22-app-fonts.png cr32-app-iconthemes.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am 
++KDE_DIST=cr48-app-stylesheet.png cr32-app-input_devices_settings.png cr64-app-kcmx.png cr64-app-locale.png cr48-app-kcmx.png cr22-app-arts.png cr16-app-kcmmemory.png cr32-app-background.png cr128-app-kcmpartitions.png crsc-app-samba.svgz cr48-app-input_devices_settings.png cr32-app-cache.png cr64-app-proxy.png cr22-app-kscreensaver.png cr22-app-hwinfo.png cr48-app-multimedia.png cr32-app-kcmx.png cr32-app-style.png cr48-app-bell.png cr48-app-date.png cr48-app-kcmdf.png cr48-app-kcmpci.png cr64-app-filetypes.png cr128-app-kthememgr.png cr64-app-style.png cr22-app-filetypes.png cr16-app-help_index.png cr48-app-key_bindings.png cr64-app-hwinfo.png cr22-app-energy.png cr16-app-iconthemes.png cr128-app-fonts.png cr16-app-energy_star.png cr16-device-laptop.png cr32-app-cookie.png crsc-app-background.svgz cr128-app-kcmpci.png cr64-app-enhanced_browsing.png cr32-app-usb.png cr48-app-enhanced_browsing.png cr22-app-keyboard.png cr64-app-kcmpci.png cr48-app-colors.png cr64-app-energy.png cr48-app-energy_star.png cr16-app-fonts.png cr48-app-iconthemes.png cr22-app-samba.png cr32-app-energy.png cr32-app-icons.png cr16-app-keyboard.png crsc-app-energy.svgz crsc-app-access.svgz cr16-app-colors.png cr16-app-looknfeel.png cr48-app-locale.png cr128-app-samba.png cr128-app-kcmkwm.png crsc-app-filetypes.svgz cr16-app-kcmsystem.png crsc-app-fonts.svgz cr64-app-personal.png Makefile.in cr22-app-stylesheet.png cr128-device-laptop.png cr32-app-kcmmemory.png cr64-app-help_index.png cr48-app-arts.png cr16-app-background.png cr16-app-kcmpartitions.png cr16-app-key_bindings.png cr16-app-kcmx.png cr16-app-clock.png cr64-app-kcmpartitions.png cr32-app-multimedia.png cr32-app-filetypes.png cr32-app-date.png cr128-app-proxy.png cr32-app-ieee1394.png cr128-app-arts.png cr16-app-icons.png cr48-app-style.png cr22-app-locale.png cr32-app-bell.png cr22-app-kcmx.png cr128-app-kcmdf.png cr32-app-keyboard_layout.png cr32-app-locale.png cr22-app-key_bindings.png cr128-app-hwinfo.png cr48-app-personal.png cr64-app-kthememgr.png cr16-app-cache.png cr32-app-enhanced_browsing.png cr48-app-usb.png cr128-app-kdmconfig.png cr128-app-energy.png cr128-app-clock.png cr22-app-style.png cr48-app-energy.png cr32-app-agent.png cr32-app-kcmprocessor.png cr64-app-kcmmemory.png cr128-app-help_index.png cr22-app-cache.png cr128-app-colors.png cr32-app-personal.png cr16-app-arts.png cr16-app-stylesheet.png cr22-app-enhanced_browsing.png cr64-app-kscreensaver.png cr22-app-bell.png cr32-app-kcmkwm.png cr48-app-access.png cr48-app-cookie.png cr32-app-kcmmidi.png cr16-app-kcmscsi.png cr64-app-colors.png cr16-app-keyboard_layout.png cr16-app-access.png cr64-app-fonts.png cr128-app-background.png cr128-app-energy_star.png cr48-app-fonts.png cr16-app-input_devices_settings.png cr32-app-kscreensaver.png cr22-app-kcmkwm.png cr32-app-kdmconfig.png cr22-app-proxy.png cr16-app-date.png cr22-app-kdmconfig.png cr32-app-kthememgr.png cr32-app-kcmsound.png cr48-app-kcmscsi.png crsc-app-locale.svgz cr128-app-bell.png cr48-app-kthememgr.png cr32-app-colors.png cr64-device-laptop.png cr22-app-iconthemes.png cr48-app-cache.png cr128-app-stylesheet.png cr48-app-kcmdrkonqi.png cr64-app-stylesheet.png cr22-app-kcmkicker.png cr64-app-ieee1394.png cr16-app-proxy.png cr16-app-hwinfo.png cr64-app-energy_star.png cr22-app-kthememgr.png cr64-app-background.png cr22-app-background.png cr32-app-kcmpartitions.png cr128-app-kcmmemory.png cr22-app-date.png cr16-app-bell.png cr32-app-arts.png cr48-app-kcmsystem.png cr48-app-agent.png cr32-app-kcmsystem.png cr48-app-looknfeel.png cr48-device-laptop.png cr64-app-icons.png cr16-app-kcmkicker.png cr16-app-panel_settings.png cr22-app-icons.png cr32-app-kcmkicker.png crsc-app-kcmkwm.svgz cr48-app-kscreensaver.png cr22-app-personal.png cr48-app-keyboard.png crsc-app-stylesheet.svgz cr16-app-samba.png cr48-app-kcmprocessor.png cr32-app-fonts.png cr16-app-personal.png cr128-app-kcmdevices.png cr48-app-proxy.png cr16-app-energy.png cr32-app-help_index.png cr16-app-multimedia.png cr16-app-kcmpci.png cr48-app-kcmdevices.png cr16-app-ieee1394.png cr64-app-multimedia.png cr16-app-style.png cr48-app-icons.png cr128-app-cache.png crsc-app-ieee1394.svgz cr32-app-keyboard.png cr48-app-kcmmemory.png cr16-app-knotify.png cr48-app-kcmpartitions.png cr16-app-agent.png cr32-app-looknfeel.png cr128-app-kscreensaver.png cr32-app-stylesheet.png cr128-app-date.png cr64-app-bell.png crsc-app-arts.svgz cr128-app-multimedia.png cr16-app-cookie.png cr64-app-kdmconfig.png cr22-app-access.png cr48-app-samba.png cr64-app-kcmdf.png cr32-app-knotify.png cr64-app-clock.png cr32-app-clock.png crsc-app-kcmx.svgz crsc-app-cache.svgz cr128-app-key_bindings.png cr48-app-kdmconfig.png cr16-app-kdmconfig.png cr22-app-kcmdevices.png cr64-app-looknfeel.png cr128-app-personal.png cr48-app-knotify.png cr48-app-background.png cr48-app-kcmmidi.png cr64-app-date.png cr48-app-clock.png cr22-app-ieee1394.png cr48-app-ieee1394.png cr32-app-proxy.png cr16-app-kscreensaver.png cr32-app-key_bindings.png cr64-app-arts.png cr64-app-samba.png cr48-app-filetypes.png cr64-app-access.png cr48-app-keyboard_layout.png cr128-app-access.png cr32-app-samba.png cr128-app-filetypes.png cr16-app-kcmmidi.png cr32-app-hwinfo.png cr48-app-help_index.png crsc-device-laptop.svgz cr16-app-usb.png cr64-app-kcmdevices.png cr48-app-hwinfo.png cr22-app-cookie.png cr64-app-knotify.png cr32-app-kcmdrkonqi.png cr128-app-locale.png crsc-app-hwinfo.svgz cr16-app-kcmkwm.png cr32-app-energy_star.png cr32-app-kcmscsi.png cr128-app-looknfeel.png cr16-app-enhanced_browsing.png cr32-device-laptop.png crsc-app-date.svgz crsc-app-bell.svgz cr16-app-locale.png cr64-app-kcmkwm.png cr64-app-cache.png cr48-app-kcmkwm.png cr22-app-agent.png cr64-app-key_bindings.png cr64-app-cookie.png cr32-app-kcmdevices.png cr48-app-kcmopengl.png crsc-app-colors.svgz cr16-app-kcmprocessor.png cr32-app-access.png cr22-device-laptop.png crsc-app-kcmdevices.svgz cr16-app-kcmsound.png cr32-app-iconthemes.png cr16-app-kthememgr.png cr22-app-fonts.png cr22-app-colors.png cr16-app-filetypes.png cr16-app-kcmdevices.png cr32-app-kcmpci.png Makefile.am 
  
  #>+ 2
  docs-am:
@@ -68661,43 +86617,33 @@
  #>+ 570
  install-kde-icons:
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
++	$(INSTALL_DATA) $(srcdir)/cr64-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
-+	$(INSTALL_DATA) $(srcdir)/crsc-device-laptop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
 -	$(INSTALL_DATA) $(srcdir)/cr48-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
@@ -68705,16 +86651,19 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
@@ -68729,14 +86678,23 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
@@ -68744,7 +86702,9 @@
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
--	$(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
@@ -68781,28 +86741,18 @@
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices
--	$(INSTALL_DATA) $(srcdir)/cr128-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices
+ 	$(INSTALL_DATA) $(srcdir)/cr128-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
@@ -68813,7 +86763,11 @@
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-ieee1394.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
@@ -68828,24 +86782,21 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
@@ -68861,22 +86812,13 @@
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
--	$(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
@@ -68886,50 +86828,72 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
--	$(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
--	$(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
++	$(INSTALL_DATA) $(srcdir)/crsc-device-laptop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
++	$(INSTALL_DATA) $(srcdir)/cr16-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-panel_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
-+	$(INSTALL_DATA) $(srcdir)/cr64-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-locale.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
@@ -68937,24 +86901,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
@@ -68966,133 +86913,70 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-ieee1394.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
--	$(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-colors.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices
-+	$(INSTALL_DATA) $(srcdir)/cr128-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
-+	$(INSTALL_DATA) $(srcdir)/cr32-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices
 -	$(INSTALL_DATA) $(srcdir)/crsc-device-laptop.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
-+	$(INSTALL_DATA) $(srcdir)/cr22-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
@@ -69105,129 +86989,269 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-arts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
  	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
--	$(INSTALL_DATA) $(srcdir)/cr22-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-cache.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmdevices.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices
+ 	$(INSTALL_DATA) $(srcdir)/cr22-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-usb.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices
 -	$(INSTALL_DATA) $(srcdir)/cr64-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-date.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-ieee1394.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-samba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
++	$(INSTALL_DATA) $(srcdir)/cr48-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-date.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
 +	$(INSTALL_DATA) $(srcdir)/crsc-app-stylesheet.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices
-+	$(INSTALL_DATA) $(srcdir)/cr48-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
--	$(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmdrkonqi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-input_devices_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices
++	$(INSTALL_DATA) $(srcdir)/cr32-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-key_bindings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmsound.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-fonts.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-access.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmmemory.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-energy.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-background.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kthememgr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-hwinfo.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-keyboard_layout.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmprocessor.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmdevices.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-colors.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-bell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-clock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-bell.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmx.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-iconthemes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-enhanced_browsing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices
-+	$(INSTALL_DATA) $(srcdir)/cr16-device-laptop.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmmidi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmopengl.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
 +	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmscsi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-filetypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kscreensaver.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-filetypes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-help_index.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kcmkwm.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-knotify.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-energy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-personal.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-cookie.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
 +	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-ieee1394.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-stylesheet.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-cache.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-access.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-style.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-arts.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
 +	$(INSTALL_DATA) $(srcdir)/cr64-app-samba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
--	$(INSTALL_DATA) $(srcdir)/cr22-app-fonts.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-proxy.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kcmpci.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kcmkwm.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-locale.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-energy_star.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
 +	$(INSTALL_DATA) $(srcdir)/cr48-app-looknfeel.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-agent.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmkicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-icons.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-background.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kcmpartitions.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmsystem.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kdmconfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-hwinfo.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
@@ -69239,42 +87263,34 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/stylesheet.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
@@ -69286,9 +87302,25 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/filetypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/stylesheet.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
@@ -69309,45 +87341,34 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdrkonqi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cookie.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/agent.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/iconthemes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
@@ -69363,11 +87384,7 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
@@ -69378,8 +87395,7 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kthememgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsystem.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
@@ -69397,23 +87413,30 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cookie.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscreensaver.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ieee1394.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cookie.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmsystem.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmmemory.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knotify.png
@@ -69421,10 +87444,15 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdmconfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/filetypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdevices.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/cache.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
@@ -69437,57 +87465,53 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmidi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keyboard_layout.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/hwinfo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/locale.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/colors.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/proxy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/enhanced_browsing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmprocessor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/icons.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/date.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/fonts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kthememgr.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
@@ -69499,32 +87523,27 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/ieee1394.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/usb.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmdevices.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/hwinfo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy_star.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/enhanced_browsing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmidi.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/stylesheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/date.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/colors.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
@@ -69540,58 +87559,22 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knotify.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpartitions.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/colors.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/proxy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bell.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bell.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdmconfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fonts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/samba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/usb.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/devices/laptop.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clock.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdevices.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/icons.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/devices/laptop.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmprocessor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ieee1394.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/input_devices_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/filetypes.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard_layout.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/devices/laptop.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knotify.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsound.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdmconfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy_star.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/bell.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy_star.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fonts.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/access.svgz
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmmemory.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/arts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
@@ -69602,138 +87585,109 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdrkonqi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/iconthemes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/filetypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmmemory.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/keyboard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/background.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/help_index.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kthememgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/proxy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/ieee1394.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/enhanced_browsing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/arts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmscsi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/energy.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fonts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmx.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/colors.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hwinfo.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard_layout.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmprocessor.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmdevices.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/bell.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/input_devices_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmdevices.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmpartitions.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bell.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmidi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/hwinfo.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmkwm.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/knotify.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmmemory.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/agent.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmopengl.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkwm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/arts.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmmemory.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/energy_star.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/personal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cache.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cookie.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/samba.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/stylesheet.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmx.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/cache.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/locale.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/date.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kthememgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmsound.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/key_bindings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/input_devices_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdevices.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ieee1394.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/proxy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/filetypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmkicker.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/enhanced_browsing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdevices.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpci.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/arts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/devices/laptop.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/usb.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/access.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/fonts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/samba.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/looknfeel.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/devices/laptop.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/date.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fonts.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/samba.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kscreensaver.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/energy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/personal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/arts.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/cookie.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/iconthemes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keyboard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/stylesheet.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/looknfeel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/colors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/devices/laptop.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keyboard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/key_bindings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/colors.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/style.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/energy.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/style.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kcmx.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmscsi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/iconthemes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/enhanced_browsing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/devices/laptop.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmkicker.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/background.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/looknfeel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmscsi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/filetypes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscreensaver.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/stylesheet.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/samba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/filetypes.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/help_index.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/samba.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/hwinfo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/agent.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ieee1394.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/stylesheet.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/cache.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/access.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/style.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/arts.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/samba.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/background.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/proxy.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fonts.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/looknfeel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/proxy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kcmpci.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kcmkwm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/locale.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/energy_star.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/looknfeel.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/agent.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmpartitions.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmkicker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/icons.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/background.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kcmpartitions.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmsystem.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdmconfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/hwinfo.png
  
  #>+ 15
  force-reedit:
@@ -69747,7 +87701,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69757,7 +87719,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -69765,7 +87727,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -69778,7 +87740,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -69792,7 +87754,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -69800,7 +87762,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -69808,7 +87770,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -69821,7 +87783,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -69830,7 +87792,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69852,7 +87814,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -327,6 +328,9 @@
+@@ -277,7 +278,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -327,6 +327,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69862,7 +87832,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -377,6 +381,7 @@
+@@ -377,6 +380,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -69870,7 +87840,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -384,12 +389,9 @@
+@@ -384,12 +388,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -69883,7 +87853,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -410,10 +412,13 @@
+@@ -410,10 +411,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -69897,7 +87867,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -422,6 +427,7 @@
+@@ -422,6 +426,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -69905,7 +87875,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -583,6 +589,7 @@
+@@ -583,6 +588,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -69913,7 +87883,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -590,10 +597,12 @@
+@@ -590,10 +596,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -69926,7 +87896,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -639,7 +648,7 @@
+@@ -639,7 +647,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -69935,7 +87905,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -677,9 +686,9 @@
+@@ -677,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -69957,7 +87927,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69967,7 +87945,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -69975,7 +87953,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -69988,7 +87966,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -70002,7 +87980,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -70010,7 +87988,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -70018,7 +87996,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -70031,7 +88009,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -600,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -70040,7 +88018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -638,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70062,7 +88040,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -303,6 +304,9 @@
+@@ -253,7 +254,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70072,7 +88058,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -70080,7 +88066,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -360,12 +365,9 @@
+@@ -360,12 +364,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -70093,7 +88079,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -386,10 +388,13 @@
+@@ -386,10 +387,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -70107,7 +88093,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -398,6 +403,7 @@
+@@ -398,6 +402,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -70115,7 +88101,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -559,6 +565,7 @@
+@@ -559,6 +564,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -70123,7 +88109,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -566,10 +573,12 @@
+@@ -566,10 +572,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -70136,7 +88122,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -610,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -70145,7 +88131,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -648,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70167,7 +88153,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70177,7 +88171,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -70185,7 +88179,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -70198,7 +88192,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -70212,7 +88206,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -70220,7 +88214,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -70228,7 +88222,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -70241,7 +88235,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -70250,7 +88244,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70272,7 +88266,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70282,7 +88284,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -70290,7 +88292,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -70303,7 +88305,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -70317,7 +88319,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -70325,7 +88327,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -70333,7 +88335,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -70346,7 +88348,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -70355,7 +88357,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70377,7 +88379,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -293,6 +294,9 @@
+@@ -243,7 +244,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70387,7 +88397,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,6 +347,7 @@
+@@ -343,6 +346,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -70395,7 +88405,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -350,12 +355,9 @@
+@@ -350,12 +354,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -70408,7 +88418,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -376,10 +378,13 @@
+@@ -376,10 +377,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -70422,7 +88432,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -388,6 +393,7 @@
+@@ -388,6 +392,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -70430,7 +88440,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -549,6 +555,7 @@
+@@ -549,6 +554,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -70438,7 +88448,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -556,10 +563,12 @@
+@@ -556,10 +562,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -70451,7 +88461,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -594,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -70460,7 +88470,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -632,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70482,7 +88492,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -294,6 +295,9 @@
+@@ -244,7 +245,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70492,7 +88510,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,6 +348,7 @@
+@@ -344,6 +347,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -70500,7 +88518,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -351,12 +356,9 @@
+@@ -351,12 +355,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -70513,7 +88531,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,10 +379,13 @@
+@@ -377,10 +378,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -70527,7 +88545,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -389,6 +394,7 @@
+@@ -389,6 +393,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -70535,7 +88553,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -550,6 +556,7 @@
+@@ -550,6 +555,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -70543,7 +88561,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -557,10 +564,12 @@
+@@ -557,10 +563,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -70556,7 +88574,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -593,7 +602,7 @@
+@@ -593,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -70565,7 +88583,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +640,9 @@
+@@ -631,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70587,7 +88605,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -316,6 +317,9 @@
+@@ -266,7 +267,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -316,6 +316,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70597,7 +88623,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -366,6 +370,7 @@
+@@ -366,6 +369,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -70605,7 +88631,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -373,12 +378,9 @@
+@@ -373,12 +377,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -70618,7 +88644,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -399,10 +401,13 @@
+@@ -399,10 +400,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -70632,7 +88658,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -411,6 +416,7 @@
+@@ -411,6 +415,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -70640,7 +88666,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -572,6 +578,7 @@
+@@ -572,6 +577,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -70648,7 +88674,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -579,10 +586,12 @@
+@@ -579,10 +585,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -70661,7 +88687,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -621,7 +630,7 @@
+@@ -621,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -70670,7 +88696,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -659,9 +668,9 @@
+@@ -659,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70682,55 +88708,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1063,22 +1072,22 @@
- mocs: kcmstyle.moc
- 
- #>+ 3
--styleconfdialog.moc: $(srcdir)/styleconfdialog.h
--	$(MOC) $(srcdir)/styleconfdialog.h -o styleconfdialog.moc
-+menupreview.moc: $(srcdir)/menupreview.h
-+	$(MOC) $(srcdir)/menupreview.h -o menupreview.moc
- 
- #>+ 2
--mocs: styleconfdialog.moc
-+mocs: menupreview.moc
- 
- #>+ 3
--menupreview.moc: $(srcdir)/menupreview.h
--	$(MOC) $(srcdir)/menupreview.h -o menupreview.moc
-+styleconfdialog.moc: $(srcdir)/styleconfdialog.h
-+	$(MOC) $(srcdir)/styleconfdialog.h -o styleconfdialog.moc
- 
- #>+ 2
--mocs: menupreview.moc
-+mocs: styleconfdialog.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kcmstyle.moc styleconfdialog.moc menupreview.moc
-+	-rm -f  kcmstyle.moc menupreview.moc styleconfdialog.moc
- 
- #>+ 2
- KDE_DIST=styleconfdialog.h Makefile.in style.desktop stylepreview.ui stylepreview.ui.h main.cpp Makefile.am 
-@@ -1134,7 +1143,7 @@
- 
- 
- #>+ 11
--kcm_style_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmstyle.cpp $(srcdir)/menupreview.cpp $(srcdir)/styleconfdialog.cpp stylepreview.cpp  kcmstyle.moc stylepreview.moc menupreview.moc styleconfdialog.moc
-+kcm_style_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmstyle.cpp $(srcdir)/menupreview.cpp $(srcdir)/styleconfdialog.cpp stylepreview.cpp  kcmstyle.moc stylepreview.moc styleconfdialog.moc menupreview.moc
- 	@echo 'creating kcm_style_la.all_cpp.cpp ...'; \
- 	rm -f kcm_style_la.all_cpp.files kcm_style_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_style_la.all_cpp.final; \
-@@ -1177,8 +1186,8 @@
- nmcheck-am: nmcheck
- kcmstyle.lo: kcmstyle.moc 
- kcmstyle.o: kcmstyle.moc 
--styleconfdialog.o: styleconfdialog.moc 
- menupreview.lo: menupreview.moc 
-+styleconfdialog.o: styleconfdialog.moc 
- $(srcdir)/styleconfdialog.cpp: stylepreview.h 
- styleconfdialog.lo: styleconfdialog.moc 
- 
 --- kcontrol/taskbar/Makefile.in
 +++ kcontrol/taskbar/Makefile.in
 @@ -156,6 +156,7 @@
@@ -70741,7 +88718,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70751,7 +88736,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -70759,7 +88744,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -70772,7 +88757,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -70786,7 +88771,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -70794,7 +88779,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -70802,7 +88787,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -70815,7 +88800,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -70824,7 +88809,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70846,7 +88831,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -298,6 +299,9 @@
+@@ -248,7 +249,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70856,7 +88849,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,6 +352,7 @@
+@@ -348,6 +351,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -70864,7 +88857,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -355,12 +360,9 @@
+@@ -355,12 +359,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -70877,7 +88870,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -381,10 +383,13 @@
+@@ -381,10 +382,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -70891,7 +88884,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -393,6 +398,7 @@
+@@ -393,6 +397,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -70899,7 +88892,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -554,6 +560,7 @@
+@@ -554,6 +559,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -70907,7 +88900,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -561,10 +568,12 @@
+@@ -561,10 +567,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -70920,7 +88913,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -601,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -70929,7 +88922,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -639,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -70951,7 +88944,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -298,6 +299,9 @@
+@@ -248,7 +249,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70961,7 +88962,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,6 +352,7 @@
+@@ -348,6 +351,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -70969,7 +88970,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -355,12 +360,9 @@
+@@ -355,12 +359,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -70982,7 +88983,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -381,10 +383,13 @@
+@@ -381,10 +382,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -70996,7 +88997,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -393,6 +398,7 @@
+@@ -393,6 +397,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -71004,7 +89005,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -554,6 +560,7 @@
+@@ -554,6 +559,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -71012,7 +89013,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -561,10 +568,12 @@
+@@ -561,10 +567,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -71025,7 +89026,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -603,7 +612,7 @@
+@@ -603,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -71034,7 +89035,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +650,9 @@
+@@ -641,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71056,7 +89057,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71066,7 +89075,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -71074,7 +89083,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -71087,7 +89096,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -71101,7 +89110,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -71109,7 +89118,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -71117,7 +89126,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -71130,7 +89139,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -71139,7 +89148,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71161,7 +89170,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -308,6 +309,9 @@
+@@ -258,7 +259,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -308,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71171,7 +89188,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -358,6 +362,7 @@
+@@ -358,6 +361,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -71179,7 +89196,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -365,12 +370,9 @@
+@@ -365,12 +369,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -71192,7 +89209,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -391,10 +393,13 @@
+@@ -391,10 +392,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -71206,7 +89223,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -403,6 +408,7 @@
+@@ -403,6 +407,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -71214,7 +89231,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -564,6 +570,7 @@
+@@ -564,6 +569,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -71222,7 +89239,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -571,10 +578,12 @@
+@@ -571,10 +577,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -71235,7 +89252,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -609,7 +618,7 @@
+@@ -609,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -71244,7 +89261,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +656,9 @@
+@@ -647,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71266,7 +89283,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -292,6 +293,9 @@
+@@ -242,7 +243,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -292,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71276,7 +89301,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,6 +346,7 @@
+@@ -342,6 +345,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -71284,7 +89309,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -349,12 +354,9 @@
+@@ -349,12 +353,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -71297,7 +89322,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -375,10 +377,13 @@
+@@ -375,10 +376,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -71311,7 +89336,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -387,6 +392,7 @@
+@@ -387,6 +391,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -71319,7 +89344,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -548,6 +554,7 @@
+@@ -548,6 +553,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -71327,7 +89352,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -555,10 +562,12 @@
+@@ -555,10 +561,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -71340,7 +89365,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -589,7 +598,7 @@
+@@ -589,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -71349,7 +89374,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +636,9 @@
+@@ -627,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71371,7 +89396,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -255,6 +256,9 @@
+@@ -205,7 +206,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -255,6 +255,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71381,7 +89414,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -305,6 +309,7 @@
+@@ -305,6 +308,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -71389,7 +89422,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -312,12 +317,9 @@
+@@ -312,12 +316,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -71402,7 +89435,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -338,10 +340,13 @@
+@@ -338,10 +339,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -71416,7 +89449,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -350,6 +355,7 @@
+@@ -350,6 +354,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -71424,7 +89457,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -511,6 +517,7 @@
+@@ -511,6 +516,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -71432,7 +89465,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -518,10 +525,12 @@
+@@ -518,10 +524,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -71445,7 +89478,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -547,7 +556,7 @@
+@@ -547,7 +555,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -71454,7 +89487,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -585,9 +594,9 @@
+@@ -585,9 +593,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71476,7 +89509,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -314,6 +315,9 @@
+@@ -264,7 +265,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -314,6 +314,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71486,7 +89527,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -364,6 +368,7 @@
+@@ -364,6 +367,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -71494,7 +89535,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -371,12 +376,9 @@
+@@ -371,12 +375,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -71507,7 +89548,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -397,10 +399,13 @@
+@@ -397,10 +398,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -71521,7 +89562,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -409,6 +414,7 @@
+@@ -409,6 +413,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -71529,7 +89570,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -570,6 +576,7 @@
+@@ -570,6 +575,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -71537,7 +89578,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -577,10 +584,12 @@
+@@ -577,10 +583,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -71550,7 +89591,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -623,7 +632,7 @@
+@@ -623,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -71559,7 +89600,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +670,9 @@
+@@ -661,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71581,7 +89622,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71591,7 +89640,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -71599,7 +89648,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -71612,7 +89661,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -71626,7 +89675,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -71634,7 +89683,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -71642,7 +89691,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -71655,7 +89704,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -561,7 +570,7 @@
+@@ -561,7 +569,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -71664,7 +89713,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +608,9 @@
+@@ -599,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71676,6 +89725,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -760,7 +768,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Penguin.png Konqui.png Star.png Pig.png Shark.png CREDITS Daemon.png Frog.png Makefile.in Blowfish.png Butterfly.png Teddybear.png Ring.png Heart.png Elephant.png Dog.png Guitar.png Cow.png Bug.png Rabbit.png Scream.png Apple.png Splash.png Ghost.png Lion.png Turtle.png Flower.png Car.png BeachBall.png Monkey.png Makefile.am 
++KDE_DIST=Penguin.png Konqui.png Star.png Pig.png Shark.png CREDITS Daemon.png Frog.png Makefile.in Blowfish.png Butterfly.png Teddybear.png Ring.png Heart.png Elephant.png Dog.png Guitar.png Cow.png Rabbit.png Bug.png Scream.png Apple.png Splash.png Ghost.png Lion.png Turtle.png Flower.png Car.png BeachBall.png Monkey.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
 --- kdepasswd/Makefile.in
 +++ kdepasswd/Makefile.in
 @@ -172,6 +172,7 @@
@@ -71686,7 +89744,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -316,6 +317,9 @@
+@@ -266,7 +267,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -316,6 +316,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71696,7 +89762,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -366,6 +370,7 @@
+@@ -366,6 +369,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -71704,7 +89770,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -373,12 +378,9 @@
+@@ -373,12 +377,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -71717,7 +89783,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -399,10 +401,13 @@
+@@ -399,10 +400,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -71731,7 +89797,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -411,6 +416,7 @@
+@@ -411,6 +415,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -71739,7 +89805,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -572,6 +578,7 @@
+@@ -572,6 +577,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -71747,7 +89813,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -579,10 +586,12 @@
+@@ -579,10 +585,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -71760,7 +89826,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -616,7 +625,7 @@
+@@ -616,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -71769,7 +89835,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +663,9 @@
+@@ -654,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71791,7 +89857,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -280,6 +281,9 @@
+@@ -230,7 +231,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71801,7 +89875,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -330,6 +334,7 @@
+@@ -330,6 +333,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -71809,7 +89883,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -337,12 +342,9 @@
+@@ -337,12 +341,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -71822,7 +89896,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -363,10 +365,13 @@
+@@ -363,10 +364,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -71836,7 +89910,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -375,6 +380,7 @@
+@@ -375,6 +379,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -71844,7 +89918,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -536,6 +542,7 @@
+@@ -536,6 +541,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -71852,7 +89926,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -543,10 +550,12 @@
+@@ -543,10 +549,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -71865,7 +89939,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -577,7 +586,7 @@
+@@ -577,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -71874,7 +89948,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +624,9 @@
+@@ -615,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71896,7 +89970,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -309,6 +310,9 @@
+@@ -259,7 +260,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -71906,7 +89988,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -359,6 +363,7 @@
+@@ -359,6 +362,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -71914,7 +89996,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -366,12 +371,9 @@
+@@ -366,12 +370,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -71927,7 +90009,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,10 +394,13 @@
+@@ -392,10 +393,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -71941,7 +90023,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -404,6 +409,7 @@
+@@ -404,6 +408,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -71949,7 +90031,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -565,6 +571,7 @@
+@@ -565,6 +570,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -71957,7 +90039,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -572,10 +579,12 @@
+@@ -572,10 +578,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -71970,7 +90052,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -616,7 +625,7 @@
+@@ -616,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -71979,7 +90061,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +663,9 @@
+@@ -654,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -71991,60 +90073,34 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -985,18 +994,18 @@
- .NOEXPORT:
+@@ -1031,38 +1039,38 @@
+ 	-rm -f  conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
  
- #>+ 3
--conffilters.moc: $(srcdir)/conffilters.h
--	$(MOC) $(srcdir)/conffilters.h -o conffilters.moc
-+faxab.moc: $(srcdir)/faxab.h
-+	$(MOC) $(srcdir)/faxab.h -o faxab.moc
- 
  #>+ 2
--mocs: conffilters.moc
-+mocs: faxab.moc
- 
- #>+ 3
--faxab.moc: $(srcdir)/faxab.h
--	$(MOC) $(srcdir)/faxab.h -o faxab.moc
-+conffilters.moc: $(srcdir)/conffilters.h
-+	$(MOC) $(srcdir)/conffilters.h -o conffilters.moc
- 
- #>+ 2
--mocs: faxab.moc
-+mocs: conffilters.moc
- 
- #>+ 3
- confsystem.moc: $(srcdir)/confsystem.h
-@@ -1028,10 +1037,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
-+	-rm -f  faxab.moc conffilters.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
- 
- #>+ 2
 -KDE_DIST=conffax.h faxfilters faxctrl.h hi64-app-kdeprintfax.png hi16-app-kdeprintfax.png Makefile.in conffilters.h anytops hi128-app-kdeprintfax.png hi48-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png hisc-app-kdeprintfax.svgz faxab.h hi32-app-kdeprintfax.png configdlg.h kdeprintfax.h filterdlg.h defcmds.h confgeneral.h kdeprintfaxui.rc hi22-app-kdeprintfax.png Makefile.am confsystem.h 
-+KDE_DIST=conffax.h faxfilters faxctrl.h hi64-app-kdeprintfax.png hi16-app-kdeprintfax.png Makefile.in conffilters.h anytops hi128-app-kdeprintfax.png hi48-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png hisc-app-kdeprintfax.svgz faxab.h hi32-app-kdeprintfax.png configdlg.h kdeprintfax.h filterdlg.h confgeneral.h defcmds.h kdeprintfaxui.rc hi22-app-kdeprintfax.png Makefile.am confsystem.h 
++KDE_DIST=conffax.h faxfilters faxctrl.h hi64-app-kdeprintfax.png hi16-app-kdeprintfax.png conffilters.h Makefile.in anytops hi128-app-kdeprintfax.png hi48-app-kdeprintfax.png kdeprintfax.desktop cr16-action-abentry.png hisc-app-kdeprintfax.svgz hi32-app-kdeprintfax.png faxab.h configdlg.h kdeprintfax.h filterdlg.h confgeneral.h defcmds.h kdeprintfaxui.rc hi22-app-kdeprintfax.png Makefile.am confsystem.h 
  
  #>+ 2
  docs-am:
-@@ -1040,29 +1049,29 @@
+ 
+ #>+ 28
  install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
  	$(INSTALL_DATA) $(srcdir)/hisc-app-kdeprintfax.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdeprintfax.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-kdeprintfax.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdeprintfax.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
@@ -72055,28 +90111,20 @@
  	$(INSTALL_DATA) $(srcdir)/cr16-action-abentry.png $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
  
  uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kdeprintfax.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdeprintfax.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdeprintfax.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdeprintfax.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdeprintfax.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdeprintfax.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdeprintfax.png
  	-rm -f $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
  
  #>+ 15
-@@ -1104,7 +1113,7 @@
- 
- 
- #>+ 11
--kdeprintfax.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kdeprintfax.cpp $(srcdir)/faxab.cpp $(srcdir)/faxctrl.cpp $(srcdir)/confgeneral.cpp $(srcdir)/configdlg.cpp $(srcdir)/conffax.cpp $(srcdir)/confsystem.cpp $(srcdir)/conffilters.cpp $(srcdir)/filterdlg.cpp $(srcdir)/defcmds.cpp  faxab.moc conffilters.moc confsystem.moc faxctrl.moc filterdlg.moc kdeprintfax.moc
-+kdeprintfax.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kdeprintfax.cpp $(srcdir)/faxab.cpp $(srcdir)/faxctrl.cpp $(srcdir)/confgeneral.cpp $(srcdir)/configdlg.cpp $(srcdir)/conffax.cpp $(srcdir)/confsystem.cpp $(srcdir)/conffilters.cpp $(srcdir)/filterdlg.cpp $(srcdir)/defcmds.cpp  conffilters.moc faxab.moc confsystem.moc faxctrl.moc filterdlg.moc kdeprintfax.moc
- 	@echo 'creating kdeprintfax.all_cpp.cpp ...'; \
- 	rm -f kdeprintfax.all_cpp.files kdeprintfax.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kdeprintfax.all_cpp.final; \
 --- kdeprint/kdeprint_part/Makefile.in
 +++ kdeprint/kdeprint_part/Makefile.in
 @@ -154,6 +154,7 @@
@@ -72087,7 +90135,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -298,6 +299,9 @@
+@@ -248,7 +249,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72097,7 +90153,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,6 +352,7 @@
+@@ -348,6 +351,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -72105,7 +90161,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -355,12 +360,9 @@
+@@ -355,12 +359,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -72118,7 +90174,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -381,10 +383,13 @@
+@@ -381,10 +382,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -72132,7 +90188,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -393,6 +398,7 @@
+@@ -393,6 +397,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -72140,7 +90196,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -554,6 +560,7 @@
+@@ -554,6 +559,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -72148,7 +90204,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -561,10 +568,12 @@
+@@ -561,10 +567,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -72161,7 +90217,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -608,7 +617,7 @@
+@@ -608,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -72170,7 +90226,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +655,9 @@
+@@ -646,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72192,7 +90248,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -315,6 +316,9 @@
+@@ -265,7 +266,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -315,6 +315,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72202,7 +90266,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -365,6 +369,7 @@
+@@ -365,6 +368,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -72210,7 +90274,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -372,12 +377,9 @@
+@@ -372,12 +376,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -72223,7 +90287,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -398,10 +400,13 @@
+@@ -398,10 +399,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -72237,7 +90301,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -410,6 +415,7 @@
+@@ -410,6 +414,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -72245,7 +90309,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -571,6 +577,7 @@
+@@ -571,6 +576,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -72253,7 +90317,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -578,10 +585,12 @@
+@@ -578,10 +584,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -72266,7 +90330,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -626,7 +635,7 @@
+@@ -626,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -72275,7 +90339,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -664,9 +673,9 @@
+@@ -664,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72287,7 +90351,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1070,29 +1079,29 @@
+@@ -1070,29 +1078,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -72297,35 +90361,35 @@
 -	$(INSTALL_DATA) $(srcdir)/hi128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/hisc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
  	$(INSTALL_DATA) $(srcdir)/hi22-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjobviewer.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjobviewer.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
 +	$(INSTALL_DATA) $(srcdir)/hi64-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjobviewer.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 +	$(INSTALL_DATA) $(srcdir)/hisc-app-kjobviewer.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kjobviewer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjobviewer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kjobviewer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjobviewer.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjobviewer.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjobviewer.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kjobviewer.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjobviewer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjobviewer.png
  
  #>+ 15
  force-reedit:
@@ -72339,7 +90403,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -309,6 +310,9 @@
+@@ -259,7 +260,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72349,7 +90421,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -359,6 +363,7 @@
+@@ -359,6 +362,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -72357,7 +90429,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -366,12 +371,9 @@
+@@ -366,12 +370,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -72370,7 +90442,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,10 +394,13 @@
+@@ -392,10 +393,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -72384,7 +90456,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -404,6 +409,7 @@
+@@ -404,6 +408,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -72392,7 +90464,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -565,6 +571,7 @@
+@@ -565,6 +570,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -72400,7 +90472,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -572,10 +579,12 @@
+@@ -572,10 +578,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -72413,7 +90485,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -616,7 +625,7 @@
+@@ -616,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -72422,7 +90494,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +663,9 @@
+@@ -654,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72444,7 +90516,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72454,7 +90534,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -72462,7 +90542,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -72475,7 +90555,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -72489,7 +90569,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -72497,7 +90577,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -72505,7 +90585,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -72518,7 +90598,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -72527,7 +90607,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72549,7 +90629,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -296,6 +297,9 @@
+@@ -246,7 +247,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72559,7 +90647,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,6 +350,7 @@
+@@ -346,6 +349,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -72567,7 +90655,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -353,12 +358,9 @@
+@@ -353,12 +357,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -72580,7 +90668,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,10 +381,13 @@
+@@ -379,10 +380,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -72594,7 +90682,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -391,6 +396,7 @@
+@@ -391,6 +395,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -72602,7 +90690,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -552,6 +558,7 @@
+@@ -552,6 +557,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -72610,7 +90698,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -559,10 +566,12 @@
+@@ -559,10 +565,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -72623,7 +90711,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -72632,7 +90720,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72644,42 +90732,45 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -942,29 +951,29 @@
+@@ -942,29 +950,29 @@
  
  #>+ 25
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 +	$(INSTALL_DATA) $(srcdir)/hi48-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
  	$(INSTALL_DATA) $(srcdir)/hi64-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/printmgr.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
  	$(INSTALL_DATA) $(srcdir)/hisc-app-printmgr.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/printmgr.svgz
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/hi48-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-printmgr.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/printmgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/printmgr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/printmgr.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/printmgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/printmgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/printmgr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/printmgr.png
  
  #>+ 15
  force-reedit:
@@ -72693,7 +90784,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -311,6 +312,9 @@
+@@ -261,7 +262,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72703,7 +90802,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -361,6 +365,7 @@
+@@ -361,6 +364,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -72711,7 +90810,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -368,12 +373,9 @@
+@@ -368,12 +372,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -72724,7 +90823,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -394,10 +396,13 @@
+@@ -394,10 +395,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -72738,7 +90837,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -406,6 +411,7 @@
+@@ -406,6 +410,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -72746,7 +90845,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -567,6 +573,7 @@
+@@ -567,6 +572,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -72754,7 +90853,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -574,10 +581,12 @@
+@@ -574,10 +580,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -72767,7 +90866,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -616,7 +625,7 @@
+@@ -616,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -72776,7 +90875,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +663,9 @@
+@@ -654,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72798,7 +90897,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72808,7 +90915,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -72816,7 +90923,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -72829,7 +90936,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -72843,7 +90950,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -72851,7 +90958,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -72859,7 +90966,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -72872,7 +90979,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -556,7 +565,7 @@
+@@ -556,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -72881,7 +90988,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +603,9 @@
+@@ -594,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -72903,7 +91010,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -72913,7 +91028,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -72921,7 +91036,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -72934,7 +91049,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -72948,7 +91063,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -72956,7 +91071,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -72964,7 +91079,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -72977,7 +91092,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -583,7 +592,7 @@
+@@ -583,7 +591,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -72986,7 +91101,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +630,9 @@
+@@ -621,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73008,7 +91123,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -279,6 +280,9 @@
+@@ -229,7 +230,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -279,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73018,7 +91141,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -329,6 +333,7 @@
+@@ -329,6 +332,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -73026,7 +91149,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -336,12 +341,9 @@
+@@ -336,12 +340,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -73039,7 +91162,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -362,10 +364,13 @@
+@@ -362,10 +363,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -73053,7 +91176,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -374,6 +379,7 @@
+@@ -374,6 +378,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -73061,7 +91184,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -535,6 +541,7 @@
+@@ -535,6 +540,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -73069,7 +91192,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -542,10 +549,12 @@
+@@ -542,10 +548,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -73082,7 +91205,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -575,7 +584,7 @@
+@@ -575,7 +583,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -73091,7 +91214,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +622,9 @@
+@@ -613,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73113,7 +91236,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -262,6 +263,9 @@
+@@ -212,7 +213,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73123,7 +91254,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -312,6 +316,7 @@
+@@ -312,6 +315,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -73131,7 +91262,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -319,12 +324,9 @@
+@@ -319,12 +323,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -73144,7 +91275,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -345,10 +347,13 @@
+@@ -345,10 +346,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -73158,7 +91289,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -357,6 +362,7 @@
+@@ -357,6 +361,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -73166,7 +91297,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -518,6 +524,7 @@
+@@ -518,6 +523,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -73174,7 +91305,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -525,10 +532,12 @@
+@@ -525,10 +531,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -73187,7 +91318,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -571,7 +580,7 @@
+@@ -571,7 +579,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -73196,7 +91327,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +618,9 @@
+@@ -609,9 +617,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73208,12 +91339,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -794,7 +803,7 @@
+@@ -794,7 +802,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=ZIP-Device.desktop linkCDROM.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop HTMLFile.html CAMERA-Device.desktop linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am 
-+KDE_DIST=linkCDROM.desktop ZIP-Device.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop HTMLFile.html CAMERA-Device.desktop linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am 
++KDE_DIST=ZIP-Device.desktop linkCDROM.desktop linkCAMERA.desktop HD.desktop linkCDWRITER.desktop NFS.desktop linkProgram.desktop Makefile.in linkHD.desktop linkNFS.desktop linkZIP.desktop CDROM-Device.desktop TextFile.desktop DVDROM-Device.desktop Program.desktop linkDVDROM.desktop MO-Device.desktop CAMERA-Device.desktop HTMLFile.html linkFloppy.desktop Directory.desktop Floppy.desktop linkURL.desktop CDWRITER-Device.desktop linkMO.desktop TextFile.txt URL.desktop HTMLFile.desktop Makefile.am 
  
  #>+ 2
  docs-am:
@@ -73227,7 +91358,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73237,7 +91376,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -73245,7 +91384,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -73258,7 +91397,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -73272,7 +91411,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -73280,7 +91419,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -73288,7 +91427,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -73301,7 +91440,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -602,7 +611,7 @@
+@@ -602,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -73310,7 +91449,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +649,9 @@
+@@ -640,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73332,7 +91471,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -295,6 +296,9 @@
+@@ -245,7 +246,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73342,7 +91489,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,6 +349,7 @@
+@@ -345,6 +348,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -73350,7 +91497,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -352,12 +357,9 @@
+@@ -352,12 +356,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -73363,7 +91510,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,10 +380,13 @@
+@@ -378,10 +379,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -73377,7 +91524,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -390,6 +395,7 @@
+@@ -390,6 +394,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -73385,7 +91532,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -551,6 +557,7 @@
+@@ -551,6 +556,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -73393,7 +91540,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -558,10 +565,12 @@
+@@ -558,10 +564,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -73406,7 +91553,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -596,7 +605,7 @@
+@@ -596,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -73415,7 +91562,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +643,9 @@
+@@ -634,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73437,7 +91584,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -368,6 +369,9 @@
+@@ -318,7 +319,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -368,6 +368,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73447,7 +91602,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -418,6 +422,7 @@
+@@ -418,6 +421,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -73455,7 +91610,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -425,12 +430,9 @@
+@@ -425,12 +429,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -73468,7 +91623,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -451,10 +453,13 @@
+@@ -451,10 +452,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -73482,7 +91637,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -463,6 +468,7 @@
+@@ -463,6 +467,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -73490,7 +91645,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -624,6 +630,7 @@
+@@ -624,6 +629,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -73498,7 +91653,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -631,10 +638,12 @@
+@@ -631,10 +637,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -73511,7 +91666,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -709,7 +718,7 @@
+@@ -709,7 +717,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -73520,7 +91675,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -747,9 +756,9 @@
+@@ -747,9 +755,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73532,73 +91687,85 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1458,13 +1467,6 @@
+@@ -1423,18 +1431,18 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
+ 
+ #>+ 3
+-minicli.moc: $(srcdir)/minicli.h
+-	$(MOC) $(srcdir)/minicli.h -o minicli.moc
++krootwm.moc: $(srcdir)/krootwm.h
++	$(MOC) $(srcdir)/krootwm.h -o krootwm.moc
+ 
+ #>+ 2
+-mocs: minicli.moc
++mocs: krootwm.moc
+ 
+ #>+ 3
+-krootwm.moc: $(srcdir)/krootwm.h
+-	$(MOC) $(srcdir)/krootwm.h -o krootwm.moc
++minicli.moc: $(srcdir)/minicli.h
++	$(MOC) $(srcdir)/minicli.h -o minicli.moc
+ 
+ #>+ 2
+-mocs: krootwm.moc
++mocs: minicli.moc
+ 
+ #>+ 3
+ startupid.moc: $(srcdir)/startupid.h
+@@ -1458,11 +1466,11 @@
  mocs: desktop.moc
  
  #>+ 3
 -kdiconview.moc: $(srcdir)/kdiconview.h
 -	$(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
--
--#>+ 2
++pixmapserver.moc: $(srcdir)/pixmapserver.h
++	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
+ 
+ #>+ 2
 -mocs: kdiconview.moc
--
--#>+ 3
++mocs: pixmapserver.moc
+ 
+ #>+ 3
  kcustommenu.moc: $(srcdir)/kcustommenu.h
- 	$(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc
+@@ -1472,11 +1480,11 @@
+ mocs: kcustommenu.moc
  
-@@ -1479,11 +1481,11 @@
- mocs: pixmapserver.moc
- 
  #>+ 3
--xautolock.moc: $(srcdir)/xautolock.h
--	$(MOC) $(srcdir)/xautolock.h -o xautolock.moc
+-pixmapserver.moc: $(srcdir)/pixmapserver.h
+-	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
 +kdiconview.moc: $(srcdir)/kdiconview.h
 +	$(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
  
  #>+ 2
--mocs: xautolock.moc
+-mocs: pixmapserver.moc
 +mocs: kdiconview.moc
  
  #>+ 3
- bgmanager.moc: $(srcdir)/bgmanager.h
-@@ -1492,6 +1494,13 @@
- #>+ 2
- mocs: bgmanager.moc
+ xautolock.moc: $(srcdir)/xautolock.h
+@@ -1503,7 +1511,7 @@
  
-+#>+ 3
-+xautolock.moc: $(srcdir)/xautolock.h
-+	$(MOC) $(srcdir)/xautolock.h -o xautolock.moc
-+
-+#>+ 2
-+mocs: xautolock.moc
-+
- #>+ 8
- kdesktop.la.closure: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES)
- 	@echo "int main() {return 0;}" > kdesktop_la_closure.cc
-@@ -1503,7 +1512,7 @@
- 
  #>+ 3
  clean-metasources:
 -	-rm -f  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc kcustommenu.moc pixmapserver.moc xautolock.moc bgmanager.moc
-+	-rm -f  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kcustommenu.moc pixmapserver.moc kdiconview.moc bgmanager.moc xautolock.moc
++	-rm -f  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc
  
  #>+ 2
  KDE_DIST=DESIGN Makefile.in kdesktop.kcfg kdesktop_custom_menu1 klaunchsettings.kcfgc kdesktopSetAsBackground.desktop minicli_ui.ui kshadowengine.h configure.in.in kfileividesktop.h kdesktopshadowsettings.h kdesktop_custom_menu2 kcustommenu.h kdesktopbindings.cpp kshadowsettings.h kdesktopsettings.kcfgc kdesktop.desktop klaunch.kcfg kdiconview.h Makefile.am 
-@@ -1572,7 +1581,7 @@
+@@ -1572,7 +1580,7 @@
  
  
  #>+ 11
 -libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc  kdesktopsettings.h $(srcdir)/krootwm.cc  kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc  kdesktopsettings.h $(srcdir)/desktop.cc  klaunchsettings.h $(srcdir)/lockeng.cc  kdesktopsettings.h $(srcdir)/bgmanager.cc  kdesktopsettings.h $(srcdir)/init.cc  kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kdiconview.moc kcustommenu.moc bgmanager.moc xautolock.moc
-+libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc  kdesktopsettings.h $(srcdir)/krootwm.cc  kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc  kdesktopsettings.h $(srcdir)/desktop.cc  klaunchsettings.h $(srcdir)/lockeng.cc  kdesktopsettings.h $(srcdir)/bgmanager.cc  kdesktopsettings.h $(srcdir)/init.cc  kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc kcustommenu.moc pixmapserver.moc xautolock.moc bgmanager.moc
++libkdeinit_kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc  kdesktopsettings.h $(srcdir)/krootwm.cc  kdesktopsettings.h $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc  kdesktopsettings.h $(srcdir)/desktop.cc  klaunchsettings.h $(srcdir)/lockeng.cc  kdesktopsettings.h $(srcdir)/bgmanager.cc  kdesktopsettings.h $(srcdir)/init.cc  kdesktopsettings.h $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli_ui.cc  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc pixmapserver.moc kcustommenu.moc bgmanager.moc xautolock.moc
  	@echo 'creating libkdeinit_kdesktop_la.all_cc.cc ...'; \
  	rm -f libkdeinit_kdesktop_la.all_cc.files libkdeinit_kdesktop_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cc.final; \
-@@ -1584,7 +1593,7 @@
+@@ -1584,7 +1592,7 @@
  	rm -f libkdeinit_kdesktop_la.all_cc.final libkdeinit_kdesktop_la.all_cc.files
  
  #>+ 11
 -libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp  kdesktopsettings.h $(srcdir)/startupid.cpp  klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kdiconview.moc kcustommenu.moc bgmanager.moc xautolock.moc
-+libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp  kdesktopsettings.h $(srcdir)/startupid.cpp  klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp  krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc kcustommenu.moc pixmapserver.moc xautolock.moc bgmanager.moc
++libkdeinit_kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp  kdesktopsettings.h $(srcdir)/startupid.cpp  klaunchsettings.h $(srcdir)/kshadowengine.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kdesktopshadowsettings.cpp $(srcdir)/kfileividesktop.cpp  minicli.moc krootwm.moc startupid.moc lockeng.moc desktop.moc kdiconview.moc pixmapserver.moc kcustommenu.moc bgmanager.moc xautolock.moc
  	@echo 'creating libkdeinit_kdesktop_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_kdesktop_la.all_cpp.files libkdeinit_kdesktop_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cpp.final; \
@@ -73612,7 +91779,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73622,7 +91797,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -73630,7 +91805,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -73643,7 +91818,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -73657,7 +91832,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -73665,7 +91840,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -73673,7 +91848,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -73686,7 +91861,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -73695,7 +91870,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73717,7 +91892,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -263,6 +264,9 @@
+@@ -213,7 +214,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73727,7 +91910,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -313,6 +317,7 @@
+@@ -313,6 +316,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -73735,7 +91918,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -320,12 +325,9 @@
+@@ -320,12 +324,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -73748,7 +91931,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -346,10 +348,13 @@
+@@ -346,10 +347,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -73762,7 +91945,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -358,6 +363,7 @@
+@@ -358,6 +362,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -73770,7 +91953,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -519,6 +525,7 @@
+@@ -519,6 +524,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -73778,7 +91961,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -526,10 +533,12 @@
+@@ -526,10 +532,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -73791,7 +91974,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -73800,7 +91983,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73822,7 +92005,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73832,7 +92023,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -73840,7 +92031,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -73853,7 +92044,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -73867,7 +92058,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -73875,7 +92066,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -73883,7 +92074,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -73896,7 +92087,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -73905,7 +92096,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -73927,7 +92118,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -291,6 +292,9 @@
+@@ -241,7 +242,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -291,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -73937,7 +92136,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,6 +345,7 @@
+@@ -341,6 +344,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -73945,7 +92144,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -348,12 +353,9 @@
+@@ -348,12 +352,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -73958,7 +92157,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -374,10 +376,13 @@
+@@ -374,10 +375,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -73972,7 +92171,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -386,6 +391,7 @@
+@@ -386,6 +390,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -73980,7 +92179,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -547,6 +553,7 @@
+@@ -547,6 +552,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -73988,7 +92187,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -554,10 +561,12 @@
+@@ -554,10 +560,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -74001,7 +92200,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -589,7 +598,7 @@
+@@ -589,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -74010,7 +92209,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +636,9 @@
+@@ -627,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74032,7 +92231,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -293,6 +294,9 @@
+@@ -243,7 +244,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74042,7 +92249,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,6 +347,7 @@
+@@ -343,6 +346,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -74050,7 +92257,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -350,12 +355,9 @@
+@@ -350,12 +354,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -74063,7 +92270,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -376,10 +378,13 @@
+@@ -376,10 +377,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -74077,7 +92284,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -388,6 +393,7 @@
+@@ -388,6 +392,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -74085,7 +92292,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -549,6 +555,7 @@
+@@ -549,6 +554,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -74093,7 +92300,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -556,10 +563,12 @@
+@@ -556,10 +562,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -74106,7 +92313,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -591,7 +600,7 @@
+@@ -591,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -74115,7 +92322,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +638,9 @@
+@@ -629,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74137,7 +92344,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -268,6 +269,9 @@
+@@ -218,7 +219,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -268,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74147,7 +92362,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -318,6 +322,7 @@
+@@ -318,6 +321,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -74155,7 +92370,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -325,12 +330,9 @@
+@@ -325,12 +329,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -74168,7 +92383,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -351,10 +353,13 @@
+@@ -351,10 +352,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -74182,7 +92397,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -363,6 +368,7 @@
+@@ -363,6 +367,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -74190,7 +92405,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -524,6 +530,7 @@
+@@ -524,6 +529,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -74198,7 +92413,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -531,10 +538,12 @@
+@@ -531,10 +537,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -74211,7 +92426,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -560,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -74220,7 +92435,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -598,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74242,7 +92457,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -290,6 +291,9 @@
+@@ -240,7 +241,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74252,7 +92475,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,6 +344,7 @@
+@@ -340,6 +343,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -74260,7 +92483,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -347,12 +352,9 @@
+@@ -347,12 +351,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -74273,7 +92496,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,10 +375,13 @@
+@@ -373,10 +374,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -74287,7 +92510,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -385,6 +390,7 @@
+@@ -385,6 +389,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -74295,7 +92518,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -546,6 +552,7 @@
+@@ -546,6 +551,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -74303,7 +92526,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -553,10 +560,12 @@
+@@ -553,10 +559,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -74316,7 +92539,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -590,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -74325,7 +92548,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -628,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74347,7 +92570,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -305,6 +306,9 @@
+@@ -255,7 +256,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74357,7 +92588,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -355,6 +359,7 @@
+@@ -355,6 +358,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -74365,7 +92596,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -362,12 +367,9 @@
+@@ -362,12 +366,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -74378,7 +92609,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -388,10 +390,13 @@
+@@ -388,10 +389,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -74392,7 +92623,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -400,6 +405,7 @@
+@@ -400,6 +404,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -74400,7 +92631,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -561,6 +567,7 @@
+@@ -561,6 +566,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -74408,7 +92639,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -568,10 +575,12 @@
+@@ -568,10 +574,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -74421,7 +92652,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -640,7 +649,7 @@
+@@ -640,7 +648,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -74430,7 +92661,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -678,9 +687,9 @@
+@@ -678,9 +686,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74452,7 +92683,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -346,6 +347,9 @@
+@@ -296,7 +297,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -346,6 +346,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74462,7 +92701,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,6 +400,7 @@
+@@ -396,6 +399,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -74470,7 +92709,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -403,12 +408,9 @@
+@@ -403,12 +407,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -74483,7 +92722,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -429,10 +431,13 @@
+@@ -429,10 +430,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -74497,7 +92736,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -441,6 +446,7 @@
+@@ -441,6 +445,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -74505,7 +92744,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -602,6 +608,7 @@
+@@ -602,6 +607,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -74513,7 +92752,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -609,10 +616,12 @@
+@@ -609,10 +615,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -74526,7 +92765,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -634,7 +643,7 @@
+@@ -634,7 +642,7 @@
  xdg_menudir = @xdg_menudir@
  
  # use 'make GENKDMCONF_FLAGS=... install' to override
@@ -74535,7 +92774,7 @@
  SUBDIRS = themer themes pics sessions
  AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \
      -I$(top_srcdir)/kdmlib $(all_includes)
-@@ -689,7 +698,7 @@
+@@ -689,7 +697,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -74544,7 +92783,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -727,9 +736,9 @@
+@@ -727,9 +735,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74566,7 +92805,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -262,6 +263,9 @@
+@@ -212,7 +213,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74576,7 +92823,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -312,6 +316,7 @@
+@@ -312,6 +315,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -74584,7 +92831,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -319,12 +324,9 @@
+@@ -319,12 +323,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -74597,7 +92844,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -345,10 +347,13 @@
+@@ -345,10 +346,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -74611,7 +92858,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -357,6 +362,7 @@
+@@ -357,6 +361,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -74619,7 +92866,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -518,6 +524,7 @@
+@@ -518,6 +523,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -74627,7 +92874,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -525,10 +532,12 @@
+@@ -525,10 +531,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -74640,7 +92887,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -74649,7 +92896,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74671,7 +92918,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -262,6 +263,9 @@
+@@ -212,7 +213,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74681,7 +92936,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -312,6 +316,7 @@
+@@ -312,6 +315,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -74689,7 +92944,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -319,12 +324,9 @@
+@@ -319,12 +323,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -74702,7 +92957,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -345,10 +347,13 @@
+@@ -345,10 +346,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -74716,7 +92971,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -357,6 +362,7 @@
+@@ -357,6 +361,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -74724,7 +92979,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -518,6 +524,7 @@
+@@ -518,6 +523,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -74732,7 +92987,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -525,10 +532,12 @@
+@@ -525,10 +531,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -74745,7 +93000,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -602,7 +611,7 @@
+@@ -602,7 +610,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -74754,7 +93009,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +649,9 @@
+@@ -640,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74766,12 +93021,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  kde.desktop: $(top_builddir)/config.status $(srcdir)/kde.desktop.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-@@ -804,7 +813,7 @@
+@@ -804,7 +812,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=9wm.desktop golem.desktop ratpoison.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in wm2.desktop xfce.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop fvwm2.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop larswm.desktop waimea.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am 
-+KDE_DIST=9wm.desktop ratpoison.desktop golem.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in xfce.desktop wm2.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop fvwm2.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop larswm.desktop waimea.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am 
++KDE_DIST=9wm.desktop golem.desktop ratpoison.desktop amiwm.desktop sapphire.desktop enlightenment.desktop aewm.desktop ude.desktop cde.desktop openbox.desktop Makefile.in xfce.desktop wm2.desktop fvwm95.desktop twm.desktop evilwm.desktop ion.desktop fluxbox.desktop xfce4.desktop amaterus.desktop vtwm.desktop olvwm.desktop metacity.desktop sawfish.desktop oroborus.desktop aewm++.desktop asclassic.desktop pwm.desktop w9wm.desktop fvwm.desktop mwm.desktop ctwm.desktop wmaker.desktop icewm.desktop afterstep.desktop phluid.desktop fvwm2.desktop qvwm.desktop matchbox.desktop gnome.desktop blackbox.desktop olwm.desktop cwwm.desktop larswm.desktop waimea.desktop flwm.desktop kde.desktop.in lwm.desktop Makefile.am 
  
  #>+ 2
  docs-am:
@@ -74785,7 +93040,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -290,6 +291,9 @@
+@@ -240,7 +241,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74795,7 +93058,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,6 +344,7 @@
+@@ -340,6 +343,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -74803,7 +93066,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -347,12 +352,9 @@
+@@ -347,12 +351,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -74816,7 +93079,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,10 +375,13 @@
+@@ -373,10 +374,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -74830,7 +93093,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -385,6 +390,7 @@
+@@ -385,6 +389,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -74838,7 +93101,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -546,6 +552,7 @@
+@@ -546,6 +551,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -74846,7 +93109,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -553,10 +560,12 @@
+@@ -553,10 +559,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -74859,7 +93122,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -597,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -74868,7 +93131,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -635,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74880,6 +93143,59 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
+@@ -881,18 +889,18 @@
+ mocs: kdmitem.moc
+ 
+ #>+ 3
+-kdmthemer.moc: $(srcdir)/kdmthemer.h
+-	$(MOC) $(srcdir)/kdmthemer.h -o kdmthemer.moc
++kdmpixmap.moc: $(srcdir)/kdmpixmap.h
++	$(MOC) $(srcdir)/kdmpixmap.h -o kdmpixmap.moc
+ 
+ #>+ 2
+-mocs: kdmthemer.moc
++mocs: kdmpixmap.moc
+ 
+ #>+ 3
+-kdmpixmap.moc: $(srcdir)/kdmpixmap.h
+-	$(MOC) $(srcdir)/kdmpixmap.h -o kdmpixmap.moc
++kdmthemer.moc: $(srcdir)/kdmthemer.h
++	$(MOC) $(srcdir)/kdmthemer.h -o kdmthemer.moc
+ 
+ #>+ 2
+-mocs: kdmpixmap.moc
++mocs: kdmthemer.moc
+ 
+ #>+ 3
+ kdmrect.moc: $(srcdir)/kdmrect.h
+@@ -903,7 +911,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kdmlabel.moc kdmitem.moc kdmthemer.moc kdmpixmap.moc kdmrect.moc
++	-rm -f  kdmlabel.moc kdmitem.moc kdmpixmap.moc kdmthemer.moc kdmrect.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in kdmthemer.h kdmitem.h kdmlayout.h kdmpixmap.h kdmlabel.h kdmrect.h Makefile.am 
+@@ -950,7 +958,7 @@
+ 
+ 
+ #>+ 11
+-libkdmthemer_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdmthemer.cpp $(srcdir)/kdmitem.cpp $(srcdir)/kdmpixmap.cpp $(srcdir)/kdmrect.cpp $(srcdir)/kdmlabel.cpp $(srcdir)/kdmlayout.cpp  kdmlabel.moc kdmitem.moc kdmpixmap.moc kdmthemer.moc kdmrect.moc
++libkdmthemer_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdmthemer.cpp $(srcdir)/kdmitem.cpp $(srcdir)/kdmpixmap.cpp $(srcdir)/kdmrect.cpp $(srcdir)/kdmlabel.cpp $(srcdir)/kdmlayout.cpp  kdmlabel.moc kdmitem.moc kdmthemer.moc kdmpixmap.moc kdmrect.moc
+ 	@echo 'creating libkdmthemer_a.all_cpp.cpp ...'; \
+ 	rm -f libkdmthemer_a.all_cpp.files libkdmthemer_a.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdmthemer_a.all_cpp.final; \
+@@ -992,8 +1000,8 @@
+ kdmlabel.o: kdmlabel.moc 
+ $(srcdir)/kdmitem.cpp: ../../config.ci 
+ $(srcdir)/kdmlayout.cpp: ../../config.ci 
+-kdmrect.o: kdmrect.moc 
+ kdmpixmap.o: kdmpixmap.moc 
++kdmrect.o: kdmrect.moc 
+ kdmitem.lo: kdmitem.moc 
+ kdmpixmap.lo: kdmpixmap.moc 
+ nmcheck: 
 --- kdm/kfrontend/themes/circles/Makefile.in
 +++ kdm/kfrontend/themes/circles/Makefile.in
 @@ -117,6 +117,7 @@
@@ -74890,7 +93206,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -74900,7 +93224,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -74908,7 +93232,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -74921,7 +93245,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -74935,7 +93259,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -74943,7 +93267,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -74951,7 +93275,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -74964,7 +93288,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -563,7 +572,7 @@
+@@ -563,7 +571,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -74973,7 +93297,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +610,9 @@
+@@ -601,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -74995,7 +93319,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75005,7 +93337,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -75013,7 +93345,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -75026,7 +93358,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -75040,7 +93372,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -75048,7 +93380,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -75056,7 +93388,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -75069,7 +93401,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -75078,7 +93410,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75100,7 +93432,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -278,6 +279,9 @@
+@@ -228,7 +229,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -278,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75110,7 +93450,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -328,6 +332,7 @@
+@@ -328,6 +331,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -75118,7 +93458,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -335,12 +340,9 @@
+@@ -335,12 +339,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -75131,7 +93471,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -361,10 +363,13 @@
+@@ -361,10 +362,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -75145,7 +93485,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -373,6 +378,7 @@
+@@ -373,6 +377,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -75153,7 +93493,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -534,6 +540,7 @@
+@@ -534,6 +539,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -75161,7 +93501,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -541,10 +548,12 @@
+@@ -541,10 +547,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -75174,7 +93514,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -575,7 +584,7 @@
+@@ -575,7 +583,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -75183,7 +93523,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +622,9 @@
+@@ -613,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75205,7 +93545,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -307,6 +308,9 @@
+@@ -257,7 +258,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -307,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75215,7 +93563,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -357,6 +361,7 @@
+@@ -357,6 +360,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -75223,7 +93571,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -364,12 +369,9 @@
+@@ -364,12 +368,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -75236,7 +93584,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -390,10 +392,13 @@
+@@ -390,10 +391,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -75250,7 +93598,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -402,6 +407,7 @@
+@@ -402,6 +406,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -75258,7 +93606,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -563,6 +569,7 @@
+@@ -563,6 +568,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -75266,7 +93614,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -570,10 +577,12 @@
+@@ -570,10 +576,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -75279,7 +93627,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -620,7 +629,7 @@
+@@ -620,7 +628,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -75288,7 +93636,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +667,9 @@
+@@ -658,9 +666,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75310,7 +93658,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -339,6 +340,9 @@
+@@ -289,7 +290,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -339,6 +339,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75320,7 +93676,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -389,6 +393,7 @@
+@@ -389,6 +392,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -75328,7 +93684,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -396,12 +401,9 @@
+@@ -396,12 +400,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -75341,7 +93697,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -422,10 +424,13 @@
+@@ -422,10 +423,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -75355,7 +93711,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -434,6 +439,7 @@
+@@ -434,6 +438,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -75363,7 +93719,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -595,6 +601,7 @@
+@@ -595,6 +600,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -75371,7 +93727,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -602,10 +609,12 @@
+@@ -602,10 +608,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -75384,7 +93740,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -656,7 +665,7 @@
+@@ -656,7 +664,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -75393,7 +93749,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -694,9 +703,9 @@
+@@ -694,9 +702,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75405,35 +93761,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1249,23 +1258,23 @@
+@@ -1249,8 +1257,6 @@
  
  #>+ 19
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfind.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
+@@ -1259,13 +1265,15 @@
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfind.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 +	$(INSTALL_DATA) $(srcdir)/hi22-app-kfind.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfind.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfind.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfind.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfind.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfind.png
  
  #>+ 15
@@ -75448,7 +93797,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75458,7 +93815,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -75466,7 +93823,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -75479,7 +93836,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -75493,7 +93850,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -75501,7 +93858,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -75509,7 +93866,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -75522,7 +93879,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -75531,7 +93888,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75543,32 +93900,36 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -735,22 +744,22 @@
+@@ -735,22 +743,22 @@
  #>+ 19
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
- 	$(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
-+	$(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
- 	$(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
+-	$(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
 -	$(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
 -	$(INSTALL_DATA) $(srcdir)/lo22-action-openfile.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
  	$(INSTALL_DATA) $(srcdir)/lo22-action-delete.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/delete.png
++	$(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
++	$(INSTALL_DATA) $(srcdir)/lo22-action-save.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
  	$(INSTALL_DATA) $(srcdir)/lo22-action-idea.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
-+	$(INSTALL_DATA) $(srcdir)/lo22-action-archive.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
++	$(INSTALL_DATA) $(srcdir)/lo22-action-info.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
 +	$(INSTALL_DATA) $(srcdir)/lo22-action-openfile.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
++	$(INSTALL_DATA) $(srcdir)/lo22-action-search.png $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
- 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
-+	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
- 	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
+-	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
+-	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
 -	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
 -	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
  	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/delete.png
++	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
++	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/save.png
  	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/idea.png
-+	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/archive.png
++	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/info.png
 +	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/openfile.png
++	-rm -f $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions/search.png
  
  #>+ 15
  force-reedit:
@@ -75582,7 +93943,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -330,6 +331,9 @@
+@@ -280,7 +281,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -330,6 +330,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75592,7 +93961,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -380,6 +384,7 @@
+@@ -380,6 +383,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -75600,7 +93969,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -387,12 +392,9 @@
+@@ -387,12 +391,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -75613,7 +93982,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -413,10 +415,13 @@
+@@ -413,10 +414,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -75627,7 +93996,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -425,6 +430,7 @@
+@@ -425,6 +429,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -75635,7 +94004,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -586,6 +592,7 @@
+@@ -586,6 +591,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -75643,7 +94012,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -593,10 +600,12 @@
+@@ -593,10 +599,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -75656,7 +94025,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -648,7 +657,7 @@
+@@ -648,7 +656,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -75665,7 +94034,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -686,9 +695,9 @@
+@@ -686,9 +694,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75687,7 +94056,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -351,6 +352,9 @@
+@@ -301,7 +302,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -351,6 +351,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -75697,7 +94074,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -401,6 +405,7 @@
+@@ -401,6 +404,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -75705,7 +94082,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -408,12 +413,9 @@
+@@ -408,12 +412,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -75718,7 +94095,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -434,10 +436,13 @@
+@@ -434,10 +435,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -75732,7 +94109,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -446,6 +451,7 @@
+@@ -446,6 +450,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -75740,7 +94117,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -607,6 +613,7 @@
+@@ -607,6 +612,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -75748,7 +94125,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -614,10 +621,12 @@
+@@ -614,10 +620,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -75761,7 +94138,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -695,7 +704,7 @@
+@@ -695,7 +703,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -75770,7 +94147,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -733,9 +742,9 @@
+@@ -733,9 +741,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -75782,187 +94159,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1308,123 +1317,123 @@
+@@ -1308,11 +1316,11 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
  
  #>+ 3
 -scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
 -	$(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
-+glossary.moc: $(srcdir)/glossary.h
-+	$(MOC) $(srcdir)/glossary.h -o glossary.moc
++history.moc: $(srcdir)/history.h
++	$(MOC) $(srcdir)/history.h -o history.moc
  
  #>+ 2
 -mocs: scrollkeepertreebuilder.moc
-+mocs: glossary.moc
++mocs: history.moc
  
  #>+ 3
--navigator.moc: $(srcdir)/navigator.h
--	$(MOC) $(srcdir)/navigator.h -o navigator.moc
-+infotree.moc: $(srcdir)/infotree.h
-+	$(MOC) $(srcdir)/infotree.h -o infotree.moc
+ navigator.moc: $(srcdir)/navigator.h
+@@ -1322,11 +1330,11 @@
+ mocs: navigator.moc
  
- #>+ 2
--mocs: navigator.moc
-+mocs: infotree.moc
- 
  #>+ 3
 -history.moc: $(srcdir)/history.h
 -	$(MOC) $(srcdir)/history.h -o history.moc
-+htmlsearchconfig.moc: $(srcdir)/htmlsearchconfig.h
-+	$(MOC) $(srcdir)/htmlsearchconfig.h -o htmlsearchconfig.moc
- 
- #>+ 2
--mocs: history.moc
-+mocs: htmlsearchconfig.moc
- 
- #>+ 3
--fontdialog.moc: $(srcdir)/fontdialog.h
--	$(MOC) $(srcdir)/fontdialog.h -o fontdialog.moc
-+searchhandler.moc: $(srcdir)/searchhandler.h
-+	$(MOC) $(srcdir)/searchhandler.h -o searchhandler.moc
- 
- #>+ 2
--mocs: fontdialog.moc
-+mocs: searchhandler.moc
- 
- #>+ 3
--glossary.moc: $(srcdir)/glossary.h
--	$(MOC) $(srcdir)/glossary.h -o glossary.moc
-+htmlsearch.moc: $(srcdir)/htmlsearch.h
-+	$(MOC) $(srcdir)/htmlsearch.h -o htmlsearch.moc
- 
- #>+ 2
--mocs: glossary.moc
-+mocs: htmlsearch.moc
- 
- #>+ 3
--treebuilder.moc: $(srcdir)/treebuilder.h
--	$(MOC) $(srcdir)/treebuilder.h -o treebuilder.moc
-+view.moc: $(srcdir)/view.h
-+	$(MOC) $(srcdir)/view.h -o view.moc
- 
- #>+ 2
--mocs: treebuilder.moc
-+mocs: view.moc
- 
- #>+ 3
--infotree.moc: $(srcdir)/infotree.h
--	$(MOC) $(srcdir)/infotree.h -o infotree.moc
-+toc.moc: $(srcdir)/toc.h
-+	$(MOC) $(srcdir)/toc.h -o toc.moc
- 
- #>+ 2
--mocs: infotree.moc
-+mocs: toc.moc
- 
- #>+ 3
--htmlsearchconfig.moc: $(srcdir)/htmlsearchconfig.h
--	$(MOC) $(srcdir)/htmlsearchconfig.h -o htmlsearchconfig.moc
-+searchwidget.moc: $(srcdir)/searchwidget.h
-+	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
- 
- #>+ 2
--mocs: htmlsearchconfig.moc
-+mocs: searchwidget.moc
- 
- #>+ 3
--mainwindow.moc: $(srcdir)/mainwindow.h
--	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
-+khc_indexbuilder.moc: $(srcdir)/khc_indexbuilder.h
-+	$(MOC) $(srcdir)/khc_indexbuilder.h -o khc_indexbuilder.moc
- 
- #>+ 2
--mocs: mainwindow.moc
-+mocs: khc_indexbuilder.moc
- 
- #>+ 3
--searchhandler.moc: $(srcdir)/searchhandler.h
--	$(MOC) $(srcdir)/searchhandler.h -o searchhandler.moc
-+searchengine.moc: $(srcdir)/searchengine.h
-+	$(MOC) $(srcdir)/searchengine.h -o searchengine.moc
- 
- #>+ 2
--mocs: searchhandler.moc
-+mocs: searchengine.moc
- 
- #>+ 3
--kcmhelpcenter.moc: $(srcdir)/kcmhelpcenter.h
--	$(MOC) $(srcdir)/kcmhelpcenter.h -o kcmhelpcenter.moc
-+navigator.moc: $(srcdir)/navigator.h
-+	$(MOC) $(srcdir)/navigator.h -o navigator.moc
- 
- #>+ 2
--mocs: kcmhelpcenter.moc
-+mocs: navigator.moc
- 
- #>+ 3
--view.moc: $(srcdir)/view.h
--	$(MOC) $(srcdir)/view.h -o view.moc
 +scrollkeepertreebuilder.moc: $(srcdir)/scrollkeepertreebuilder.h
 +	$(MOC) $(srcdir)/scrollkeepertreebuilder.h -o scrollkeepertreebuilder.moc
  
  #>+ 2
--mocs: view.moc
+-mocs: history.moc
 +mocs: scrollkeepertreebuilder.moc
  
  #>+ 3
--htmlsearch.moc: $(srcdir)/htmlsearch.h
--	$(MOC) $(srcdir)/htmlsearch.h -o htmlsearch.moc
-+history.moc: $(srcdir)/history.h
-+	$(MOC) $(srcdir)/history.h -o history.moc
+ fontdialog.moc: $(srcdir)/fontdialog.h
+@@ -1437,10 +1445,10 @@
  
- #>+ 2
--mocs: htmlsearch.moc
-+mocs: history.moc
- 
  #>+ 3
--toc.moc: $(srcdir)/toc.h
--	$(MOC) $(srcdir)/toc.h -o toc.moc
-+fontdialog.moc: $(srcdir)/fontdialog.h
-+	$(MOC) $(srcdir)/fontdialog.h -o fontdialog.moc
- 
- #>+ 2
--mocs: toc.moc
-+mocs: fontdialog.moc
- 
- #>+ 3
--searchwidget.moc: $(srcdir)/searchwidget.h
--	$(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc
-+treebuilder.moc: $(srcdir)/treebuilder.h
-+	$(MOC) $(srcdir)/treebuilder.h -o treebuilder.moc
- 
- #>+ 2
--mocs: searchwidget.moc
-+mocs: treebuilder.moc
- 
- #>+ 3
--khc_indexbuilder.moc: $(srcdir)/khc_indexbuilder.h
--	$(MOC) $(srcdir)/khc_indexbuilder.h -o khc_indexbuilder.moc
-+mainwindow.moc: $(srcdir)/mainwindow.h
-+	$(MOC) $(srcdir)/mainwindow.h -o mainwindow.moc
- 
- #>+ 2
--mocs: khc_indexbuilder.moc
-+mocs: mainwindow.moc
- 
- #>+ 3
--searchengine.moc: $(srcdir)/searchengine.h
--	$(MOC) $(srcdir)/searchengine.h -o searchengine.moc
-+kcmhelpcenter.moc: $(srcdir)/kcmhelpcenter.h
-+	$(MOC) $(srcdir)/kcmhelpcenter.h -o kcmhelpcenter.moc
- 
- #>+ 2
--mocs: searchengine.moc
-+mocs: kcmhelpcenter.moc
- 
- #>+ 8
- khelpcenter.la.closure: $(khelpcenter_la_OBJECTS) $(khelpcenter_la_DEPENDENCIES)
-@@ -1437,10 +1446,10 @@
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  scrollkeepertreebuilder.moc navigator.moc history.moc fontdialog.moc glossary.moc treebuilder.moc infotree.moc htmlsearchconfig.moc mainwindow.moc searchhandler.moc kcmhelpcenter.moc view.moc htmlsearch.moc toc.moc searchwidget.moc khc_indexbuilder.moc searchengine.moc
-+	-rm -f  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc khc_indexbuilder.moc searchengine.moc navigator.moc scrollkeepertreebuilder.moc history.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
++	-rm -f  history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc glossary.moc treebuilder.moc infotree.moc htmlsearchconfig.moc mainwindow.moc searchhandler.moc kcmhelpcenter.moc view.moc htmlsearch.moc toc.moc searchwidget.moc khc_indexbuilder.moc searchengine.moc
  
  #>+ 2
 -KDE_DIST=fontdialog.h glossary.xslt kcmhelpcenter.desktop khc_indexbuilder.h navigator.h DESIGN docentrytraverser.h glossary.html.in htmlsearchconfig.h htmlsearch.h plugintraverser.h view.h Makefile.in searchhandler.h scrollkeepertreebuilder.h scopeitem.h mainwindow.h glossary.h treebuilder.h khelpcenterui.rc docentry.h configure.in.in searchengine.h navigatorappitem.h history.h table-of-contents.xslt application.h formatter.h prefs.kcfgc README.metadata khelpcenter.kcfg docmetainfo.h index.html.in Help.desktop navigatoritem.h khelpcenter.desktop toc.h infotree.h searchwidget.h intro.html.in kcmhelpcenter.h README.htdig version.h Makefile.am 
@@ -75970,35 +94202,15 @@
  
  #>+ 6
  clean-idl:
-@@ -1500,7 +1509,7 @@
+@@ -1500,7 +1508,7 @@
  
  
  #>+ 11
 -libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc scrollkeepertreebuilder.moc navigator.moc history.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
-+libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc navigator.moc scrollkeepertreebuilder.moc history.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
++libkdeinit_khelpcenter_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/navigator.cpp $(srcdir)/navigatoritem.cpp $(srcdir)/navigatorappitem.cpp $(srcdir)/view.cpp $(srcdir)/searchwidget.cpp $(srcdir)/searchengine.cpp $(srcdir)/docmetainfo.cpp $(srcdir)/docentrytraverser.cpp $(srcdir)/formatter.cpp $(srcdir)/glossary.cpp $(srcdir)/toc.cpp $(srcdir)/mainwindow.cpp $(srcdir)/docentry.cpp $(srcdir)/htmlsearch.cpp $(srcdir)/history.cpp $(srcdir)/application.cpp $(srcdir)/treebuilder.cpp $(srcdir)/infotree.cpp $(srcdir)/kcmhelpcenter.cpp $(srcdir)/htmlsearchconfig.cpp $(srcdir)/fontdialog.cpp $(srcdir)/plugintraverser.cpp $(srcdir)/scrollkeepertreebuilder.cpp $(srcdir)/searchhandler.cpp searchwidget_skel.cpp mainwindow_skel.cpp kcmhelpcenter_skel.cpp prefs.cpp  glossary.moc infotree.moc htmlsearchconfig.moc searchhandler.moc htmlsearch.moc view.moc toc.moc searchwidget.moc searchengine.moc history.moc navigator.moc scrollkeepertreebuilder.moc fontdialog.moc treebuilder.moc mainwindow.moc kcmhelpcenter.moc
  	@echo 'creating libkdeinit_khelpcenter_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_khelpcenter_la.all_cpp.files libkdeinit_khelpcenter_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_khelpcenter_la.all_cpp.final; \
-@@ -1562,8 +1571,8 @@
- searchwidget.o: searchwidget.moc 
- toc.lo: toc.moc 
- $(srcdir)/htmlsearch.cpp: prefs.h 
--toc.o: toc.moc 
- treebuilder.lo: treebuilder.moc 
-+toc.o: toc.moc 
- $(srcdir)/history.cpp: prefs.h 
- infotree.lo: infotree.moc 
- htmlsearch.o: htmlsearch.moc 
-@@ -1610,8 +1619,8 @@
- glossary.o: glossary.moc 
- searchengine.lo: searchengine.moc 
- history.lo: history.moc 
--htmlsearchconfig.lo: htmlsearchconfig.moc 
- kcmhelpcenter.lo: kcmhelpcenter.moc 
-+htmlsearchconfig.lo: htmlsearchconfig.moc 
- $(srcdir)/htmlsearchconfig.cpp: prefs.h 
- infotree.o: infotree.moc 
- mainwindow.o: mainwindow.moc 
 --- khelpcenter/pics/Makefile.in
 +++ khelpcenter/pics/Makefile.in
 @@ -107,6 +107,7 @@
@@ -76009,7 +94221,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76019,7 +94239,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -76027,7 +94247,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -76040,7 +94260,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -76054,7 +94274,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -76062,7 +94282,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -76070,7 +94290,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -76083,7 +94303,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -545,7 +554,7 @@
+@@ -545,7 +553,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -76092,7 +94312,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -583,9 +592,9 @@
+@@ -583,9 +591,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76104,7 +94324,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -735,28 +744,28 @@
+@@ -735,29 +743,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -76112,36 +94332,37 @@
 -	$(INSTALL_DATA) $(srcdir)/hi128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khelpcenter.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khelpcenter.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/hisc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
 +	$(INSTALL_DATA) $(srcdir)/hi128-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khelpcenter.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
- 	$(INSTALL_DATA) $(srcdir)/hisc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/hisc-app-khelpcenter.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-khelpcenter.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khelpcenter.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khelpcenter.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/khelpcenter.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/khelpcenter.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khelpcenter.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/khelpcenter.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/khelpcenter.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khelpcenter.png
  
  #>+ 15
+ force-reedit:
 --- khelpcenter/plugins/Applications/Makefile.in
 +++ khelpcenter/plugins/Applications/Makefile.in
 @@ -117,6 +117,7 @@
@@ -76152,7 +94373,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76162,7 +94391,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -76170,7 +94399,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -76183,7 +94412,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -76197,7 +94426,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -76205,7 +94434,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -76213,7 +94442,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -76226,7 +94455,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -76235,7 +94464,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76257,7 +94486,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -277,6 +278,9 @@
+@@ -227,7 +228,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76267,7 +94504,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,6 +331,7 @@
+@@ -327,6 +330,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -76275,7 +94512,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -334,12 +339,9 @@
+@@ -334,12 +338,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -76288,7 +94525,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,10 +362,13 @@
+@@ -360,10 +361,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -76302,7 +94539,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -372,6 +377,7 @@
+@@ -372,6 +376,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -76310,7 +94547,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -533,6 +539,7 @@
+@@ -533,6 +538,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -76318,7 +94555,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -540,10 +547,12 @@
+@@ -540,10 +546,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -76331,7 +94568,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -575,7 +584,7 @@
+@@ -575,7 +583,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -76340,7 +94577,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -613,9 +622,9 @@
+@@ -613,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76362,7 +94599,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76372,7 +94617,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -76380,7 +94625,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -76393,7 +94638,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -76407,7 +94652,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -76415,7 +94660,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -76423,7 +94668,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -76436,7 +94681,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -556,7 +565,7 @@
+@@ -556,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -76445,7 +94690,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +603,9 @@
+@@ -594,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76467,7 +94712,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76477,7 +94730,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -76485,7 +94738,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -76498,7 +94751,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -76512,7 +94765,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -76520,7 +94773,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -76528,7 +94781,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -76541,7 +94794,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -76550,7 +94803,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76572,7 +94825,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76582,7 +94843,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -76590,7 +94851,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -76603,7 +94864,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -76617,7 +94878,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -76625,7 +94886,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -76633,7 +94894,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -76646,7 +94907,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -76655,7 +94916,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76677,7 +94938,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76687,7 +94956,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -76695,7 +94964,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -76708,7 +94977,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -76722,7 +94991,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -76730,7 +94999,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -76738,7 +95007,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -76751,7 +95020,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -565,7 +574,7 @@
+@@ -565,7 +573,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -76760,7 +95029,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -603,9 +612,9 @@
+@@ -603,9 +611,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76782,7 +95051,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -326,6 +327,9 @@
+@@ -276,7 +277,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -326,6 +326,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76792,7 +95069,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -376,6 +380,7 @@
+@@ -376,6 +379,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -76800,7 +95077,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -383,12 +388,9 @@
+@@ -383,12 +387,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -76813,7 +95090,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -409,10 +411,13 @@
+@@ -409,10 +410,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -76827,7 +95104,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -421,6 +426,7 @@
+@@ -421,6 +425,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -76835,7 +95112,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -582,6 +588,7 @@
+@@ -582,6 +587,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -76843,7 +95120,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -589,10 +596,12 @@
+@@ -589,10 +595,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -76856,7 +95133,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -643,7 +652,7 @@
+@@ -643,7 +651,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -76865,7 +95142,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -681,9 +690,9 @@
+@@ -681,9 +689,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76887,7 +95164,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -76897,7 +95182,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -76905,7 +95190,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -76918,7 +95203,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -76932,7 +95217,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -76940,7 +95225,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -76948,7 +95233,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -76961,7 +95246,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -600,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -76970,7 +95255,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -638,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -76992,7 +95277,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -263,6 +264,9 @@
+@@ -213,7 +214,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77002,7 +95295,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -313,6 +317,7 @@
+@@ -313,6 +316,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -77010,7 +95303,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -320,12 +325,9 @@
+@@ -320,12 +324,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -77023,7 +95316,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -346,10 +348,13 @@
+@@ -346,10 +347,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -77037,7 +95330,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -358,6 +363,7 @@
+@@ -358,6 +362,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -77045,7 +95338,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -519,6 +525,7 @@
+@@ -519,6 +524,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -77053,7 +95346,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -526,10 +533,12 @@
+@@ -526,10 +532,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -77066,7 +95359,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -77075,7 +95368,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77097,7 +95390,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -341,6 +342,9 @@
+@@ -291,7 +292,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -341,6 +341,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77107,7 +95408,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -391,6 +395,7 @@
+@@ -391,6 +394,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -77115,7 +95416,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -398,12 +403,9 @@
+@@ -398,12 +402,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -77128,7 +95429,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -424,10 +426,13 @@
+@@ -424,10 +425,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -77142,7 +95443,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -436,6 +441,7 @@
+@@ -436,6 +440,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -77150,7 +95451,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -597,6 +603,7 @@
+@@ -597,6 +602,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -77158,7 +95459,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -604,10 +611,12 @@
+@@ -604,10 +610,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -77171,7 +95472,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -668,7 +677,7 @@
+@@ -668,7 +676,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -77180,7 +95481,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -706,9 +715,9 @@
+@@ -706,9 +714,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77192,146 +95493,115 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1134,18 +1143,18 @@
+@@ -1162,13 +1170,6 @@
+ mocs: gestures_settings_tab.moc
  
- 
  #>+ 3
--gesturedrawer.moc: $(srcdir)/gesturedrawer.h
--	$(MOC) $(srcdir)/gesturedrawer.h -o gesturedrawer.moc
-+windowdef_simple_widget.moc: $(srcdir)/windowdef_simple_widget.h
-+	$(MOC) $(srcdir)/windowdef_simple_widget.h -o windowdef_simple_widget.moc
+-action_group_tab.moc: $(srcdir)/action_group_tab.h
+-	$(MOC) $(srcdir)/action_group_tab.h -o action_group_tab.moc
+-
+-#>+ 2
+-mocs: action_group_tab.moc
+-
+-#>+ 3
+ gesture_triggers_tab.moc: $(srcdir)/gesture_triggers_tab.h
+ 	$(MOC) $(srcdir)/gesture_triggers_tab.h -o gesture_triggers_tab.moc
  
- #>+ 2
--mocs: gesturedrawer.moc
-+mocs: windowdef_simple_widget.moc
- 
- #>+ 3
--windowdef_simple_widget.moc: $(srcdir)/windowdef_simple_widget.h
--	$(MOC) $(srcdir)/windowdef_simple_widget.h -o windowdef_simple_widget.moc
-+gesturedrawer.moc: $(srcdir)/gesturedrawer.h
-+	$(MOC) $(srcdir)/gesturedrawer.h -o gesturedrawer.moc
- 
- #>+ 2
--mocs: windowdef_simple_widget.moc
-+mocs: gesturedrawer.moc
- 
- #>+ 3
- voicerecordpage.moc: $(srcdir)/voicerecordpage.h
-@@ -1176,18 +1185,18 @@
+@@ -1176,11 +1177,11 @@
  mocs: gesture_triggers_tab.moc
  
  #>+ 3
 -kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
 -	$(MOC) $(srcdir)/kcmkhotkeys.h -o kcmkhotkeys.moc
-+voicerecorder.moc: $(srcdir)/voicerecorder.h
-+	$(MOC) $(srcdir)/voicerecorder.h -o voicerecorder.moc
++action_group_tab.moc: $(srcdir)/action_group_tab.h
++	$(MOC) $(srcdir)/action_group_tab.h -o action_group_tab.moc
  
  #>+ 2
 -mocs: kcmkhotkeys.moc
-+mocs: voicerecorder.moc
++mocs: action_group_tab.moc
  
  #>+ 3
--voicerecorder.moc: $(srcdir)/voicerecorder.h
--	$(MOC) $(srcdir)/voicerecorder.h -o voicerecorder.moc
+ voicerecorder.moc: $(srcdir)/voicerecorder.h
+@@ -1190,6 +1191,13 @@
+ mocs: voicerecorder.moc
+ 
+ #>+ 3
 +kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
 +	$(MOC) $(srcdir)/kcmkhotkeys.h -o kcmkhotkeys.moc
- 
- #>+ 2
--mocs: voicerecorder.moc
++
++#>+ 2
 +mocs: kcmkhotkeys.moc
- 
- #>+ 3
++
++#>+ 3
  tab_widget.moc: $(srcdir)/tab_widget.h
-@@ -1197,18 +1206,18 @@
- mocs: tab_widget.moc
+ 	$(MOC) $(srcdir)/tab_widget.h -o tab_widget.moc
  
- #>+ 3
--dcop_widget.moc: $(srcdir)/dcop_widget.h
--	$(MOC) $(srcdir)/dcop_widget.h -o dcop_widget.moc
-+condition_list_widget.moc: $(srcdir)/condition_list_widget.h
-+	$(MOC) $(srcdir)/condition_list_widget.h -o condition_list_widget.moc
- 
- #>+ 2
--mocs: dcop_widget.moc
-+mocs: condition_list_widget.moc
- 
- #>+ 3
--condition_list_widget.moc: $(srcdir)/condition_list_widget.h
--	$(MOC) $(srcdir)/condition_list_widget.h -o condition_list_widget.moc
-+dcop_widget.moc: $(srcdir)/dcop_widget.h
-+	$(MOC) $(srcdir)/dcop_widget.h -o dcop_widget.moc
- 
- #>+ 2
--mocs: condition_list_widget.moc
-+mocs: dcop_widget.moc
- 
- #>+ 3
- actions_listview_widget.moc: $(srcdir)/actions_listview_widget.h
-@@ -1225,11 +1234,11 @@
+@@ -1225,6 +1233,13 @@
  mocs: action_list_widget.moc
  
  #>+ 3
--main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
--	$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
 +gesturerecorder.moc: $(srcdir)/gesturerecorder.h
 +	$(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
- 
- #>+ 2
--mocs: main_buttons_widget.moc
++
++#>+ 2
 +mocs: gesturerecorder.moc
++
++#>+ 3
+ main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
+ 	$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
  
- #>+ 3
- menuentry_widget.moc: $(srcdir)/menuentry_widget.h
-@@ -1239,11 +1248,11 @@
+@@ -1239,13 +1254,6 @@
  mocs: menuentry_widget.moc
  
  #>+ 3
 -gesturerecorder.moc: $(srcdir)/gesturerecorder.h
 -	$(MOC) $(srcdir)/gesturerecorder.h -o gesturerecorder.moc
-+main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
-+	$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: gesturerecorder.moc
-+mocs: main_buttons_widget.moc
- 
- #>+ 3
+-
+-#>+ 3
  general_tab.moc: $(srcdir)/general_tab.h
-@@ -1281,18 +1290,18 @@
- mocs: windowselector.moc
+ 	$(MOC) $(srcdir)/general_tab.h -o general_tab.moc
  
+@@ -1274,6 +1282,13 @@
+ mocs: gesturerecordpage.moc
+ 
  #>+ 3
--command_url_widget.moc: $(srcdir)/command_url_widget.h
--	$(MOC) $(srcdir)/command_url_widget.h -o command_url_widget.moc
 +triggers_tab.moc: $(srcdir)/triggers_tab.h
 +	$(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
- 
- #>+ 2
--mocs: command_url_widget.moc
++
++#>+ 2
 +mocs: triggers_tab.moc
++
++#>+ 3
+ windowselector.moc: $(srcdir)/windowselector.h
+ 	$(MOC) $(srcdir)/windowselector.h -o windowselector.moc
  
+@@ -1288,13 +1303,6 @@
+ mocs: command_url_widget.moc
+ 
  #>+ 3
 -triggers_tab.moc: $(srcdir)/triggers_tab.h
 -	$(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
-+command_url_widget.moc: $(srcdir)/command_url_widget.h
-+	$(MOC) $(srcdir)/command_url_widget.h -o command_url_widget.moc
- 
- #>+ 2
+-
+-#>+ 2
 -mocs: triggers_tab.moc
-+mocs: command_url_widget.moc
- 
- #>+ 3
+-
+-#>+ 3
  keyboard_input_widget.moc: $(srcdir)/keyboard_input_widget.h
-@@ -1333,7 +1342,7 @@
+ 	$(MOC) $(srcdir)/keyboard_input_widget.h -o keyboard_input_widget.moc
  
+@@ -1333,7 +1341,7 @@
+ 
  #>+ 3
  clean-metasources:
 -	-rm -f  gesturedrawer.moc windowdef_simple_widget.moc voicerecordpage.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc voicerecorder.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc main_buttons_widget.moc menuentry_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc voice_settings_tab.moc gesturerecordpage.moc windowselector.moc command_url_widget.moc triggers_tab.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
-+	-rm -f  windowdef_simple_widget.moc gesturedrawer.moc voicerecordpage.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc voicerecorder.moc kcmkhotkeys.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc actions_listview_widget.moc action_list_widget.moc gesturerecorder.moc menuentry_widget.moc main_buttons_widget.moc general_tab.moc window_trigger_widget.moc voice_settings_tab.moc gesturerecordpage.moc windowselector.moc triggers_tab.moc command_url_widget.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
++	-rm -f  gesturedrawer.moc windowdef_simple_widget.moc voicerecordpage.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc voicerecorder.moc kcmkhotkeys.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc actions_listview_widget.moc action_list_widget.moc gesturerecorder.moc main_buttons_widget.moc menuentry_widget.moc general_tab.moc window_trigger_widget.moc voice_settings_tab.moc gesturerecordpage.moc triggers_tab.moc windowselector.moc command_url_widget.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
  
  #>+ 2
  KDE_DIST=hi32-app-khotkeys.png Makefile.in khotkeys.desktop hi16-app-khotkeys.png Makefile.am 
-@@ -1347,14 +1356,14 @@
+@@ -1347,14 +1355,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -77349,12 +95619,12 @@
  
  #>+ 15
  force-reedit:
-@@ -1395,7 +1404,7 @@
+@@ -1395,7 +1403,7 @@
  
  
  #>+ 11
 -kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp $(srcdir)/voicerecorder.cpp $(srcdir)/voicerecordpage.cpp $(srcdir)/voice_settings_tab.cpp  windowdef_simple_widget.moc gesturedrawer.moc voicerecordpage.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc voicerecorder.moc kcmkhotkeys.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc action_list_widget.moc actions_listview_widget.moc gesturerecorder.moc menuentry_widget.moc main_buttons_widget.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc voice_settings_tab.moc triggers_tab.moc command_url_widget.moc windowselector.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
-+kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp $(srcdir)/voicerecorder.cpp $(srcdir)/voicerecordpage.cpp $(srcdir)/voice_settings_tab.cpp  gesturedrawer.moc windowdef_simple_widget.moc voicerecordpage.moc gestures_settings_tab.moc gesture_triggers_tab.moc action_group_tab.moc kcmkhotkeys.moc voicerecorder.moc tab_widget.moc dcop_widget.moc condition_list_widget.moc action_list_widget.moc actions_listview_widget.moc main_buttons_widget.moc menuentry_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc voice_settings_tab.moc command_url_widget.moc triggers_tab.moc windowselector.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
++kcm_khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/menuedit.cpp $(srcdir)/window_trigger_widget.cpp $(srcdir)/tab_widget.cpp $(srcdir)/main_buttons_widget.cpp $(srcdir)/actions_listview_widget.cpp $(srcdir)/menuentry_widget.cpp $(srcdir)/general_tab.cpp $(srcdir)/action_group_tab.cpp $(srcdir)/kcmkhotkeys.cpp $(srcdir)/command_url_widget.cpp $(srcdir)/windowdef_list_widget.cpp $(srcdir)/windowdef_simple_widget.cpp $(srcdir)/triggers_tab.cpp $(srcdir)/dcop_widget.cpp $(srcdir)/info_tab.cpp $(srcdir)/action_list_widget.cpp $(srcdir)/keyboard_input_widget.cpp $(srcdir)/condition_list_widget.cpp $(srcdir)/gesturedrawer.cpp $(srcdir)/gesturerecorder.cpp $(srcdir)/gesturerecordpage.cpp $(srcdir)/gesture_triggers_tab.cpp $(srcdir)/windowselector.cpp $(srcdir)/gestures_settings_tab.cpp $(srcdir)/general_settings_tab.cpp $(srcdir)/voicerecorder.cpp $(srcdir)/voicerecordpage.cpp $(srcdir)/voice_settings_tab.cpp  windowdef_simple_widget.moc gesturedrawer.moc voicerecordpage.moc gestures_settings_tab.moc action_group_tab.moc gesture_triggers_tab.moc kcmkhotkeys.moc voicerecorder.moc tab_widget.moc condition_list_widget.moc dcop_widget.moc action_list_widget.moc actions_listview_widget.moc menuentry_widget.moc main_buttons_widget.moc gesturerecorder.moc general_tab.moc window_trigger_widget.moc gesturerecordpage.moc voice_settings_tab.moc command_url_widget.moc windowselector.moc triggers_tab.moc keyboard_input_widget.moc info_tab.moc general_settings_tab.moc windowdef_list_widget.moc
  	@echo 'creating kcm_khotkeys_la.all_cpp.cpp ...'; \
  	rm -f kcm_khotkeys_la.all_cpp.files kcm_khotkeys_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_khotkeys_la.all_cpp.final; \
@@ -77368,7 +95638,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -286,6 +287,9 @@
+@@ -236,7 +237,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77378,7 +95656,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,6 +340,7 @@
+@@ -336,6 +339,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -77386,7 +95664,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -343,12 +348,9 @@
+@@ -343,12 +347,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -77399,7 +95677,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,10 +371,13 @@
+@@ -369,10 +370,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -77413,7 +95691,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -381,6 +386,7 @@
+@@ -381,6 +385,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -77421,7 +95699,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -542,6 +548,7 @@
+@@ -542,6 +547,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -77429,7 +95707,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -549,10 +556,12 @@
+@@ -549,10 +555,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -77442,7 +95720,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -600,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -77451,7 +95729,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -638,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77463,6 +95741,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
+@@ -873,7 +881,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui Makefile.in dcop_widget_ui.ui menuentry_widget_ui.ui action_list_widget_ui.ui voice_input_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui voice_settings_tab_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am 
++KDE_DIST=general_settings_tab_ui.ui general_tab_ui.ui window_trigger_widget_ui.ui triggers_tab_ui.ui windowdef_list_widget_ui.ui actions_listview_widget_ui.ui dcop_widget_ui.ui Makefile.in menuentry_widget_ui.ui action_list_widget_ui.ui voice_input_widget_ui.ui windowdef_simple_widget_ui.ui info_tab_ui.ui keyboard_input_widget_ui.ui command_url_widget_ui.ui condition_list_widget_ui.ui voice_settings_tab_ui.ui action_group_tab_ui.ui main_buttons_widget_ui.ui gesture_triggers_tab_ui.ui gestures_settings_tab_ui.ui Makefile.am 
+ 
+ #>+ 23
+ clean-ui:
 --- khotkeys/Makefile.in
 +++ khotkeys/Makefile.in
 @@ -134,6 +134,7 @@
@@ -77473,7 +95760,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -278,6 +279,9 @@
+@@ -228,7 +229,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -278,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77483,7 +95778,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -328,6 +332,7 @@
+@@ -328,6 +331,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -77491,7 +95786,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -335,12 +340,9 @@
+@@ -335,12 +339,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -77504,7 +95799,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -361,10 +363,13 @@
+@@ -361,10 +362,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -77518,7 +95813,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -373,6 +378,7 @@
+@@ -373,6 +377,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -77526,7 +95821,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -534,6 +540,7 @@
+@@ -534,6 +539,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -77534,7 +95829,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -541,10 +548,12 @@
+@@ -541,10 +547,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -77547,7 +95842,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -573,7 +582,7 @@
+@@ -573,7 +581,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -77556,7 +95851,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -611,9 +620,9 @@
+@@ -611,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77578,7 +95873,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -303,6 +304,9 @@
+@@ -253,7 +254,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77588,7 +95891,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -77596,7 +95899,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -360,12 +365,9 @@
+@@ -360,12 +364,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -77609,7 +95912,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -386,10 +388,13 @@
+@@ -386,10 +387,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -77623,7 +95926,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -398,6 +403,7 @@
+@@ -398,6 +402,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -77631,7 +95934,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -559,6 +565,7 @@
+@@ -559,6 +564,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -77639,7 +95942,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -566,10 +573,12 @@
+@@ -566,10 +572,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -77652,7 +95955,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -610,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -77661,7 +95964,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -648,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77683,7 +95986,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -286,6 +287,9 @@
+@@ -236,7 +237,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77693,7 +96004,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,6 +340,7 @@
+@@ -336,6 +339,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -77701,7 +96012,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -343,12 +348,9 @@
+@@ -343,12 +347,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -77714,7 +96025,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,10 +371,13 @@
+@@ -369,10 +370,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -77728,7 +96039,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -381,6 +386,7 @@
+@@ -381,6 +385,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -77736,7 +96047,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -542,6 +548,7 @@
+@@ -542,6 +547,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -77744,7 +96055,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -549,10 +556,12 @@
+@@ -549,10 +555,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -77757,7 +96068,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -584,7 +593,7 @@
+@@ -584,7 +592,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -77766,7 +96077,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +631,9 @@
+@@ -622,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77788,7 +96099,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77798,7 +96117,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -77806,7 +96125,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -77819,7 +96138,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -77833,7 +96152,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -77841,7 +96160,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -77849,7 +96168,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -77862,7 +96181,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -606,7 +615,7 @@
+@@ -606,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -77871,7 +96190,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +653,9 @@
+@@ -644,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77893,7 +96212,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -312,6 +313,9 @@
+@@ -262,7 +263,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -312,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -77903,7 +96230,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -362,6 +366,7 @@
+@@ -362,6 +365,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -77911,7 +96238,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -369,12 +374,9 @@
+@@ -369,12 +373,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -77924,7 +96251,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -395,10 +397,13 @@
+@@ -395,10 +396,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -77938,7 +96265,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -407,6 +412,7 @@
+@@ -407,6 +411,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -77946,7 +96273,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -568,6 +574,7 @@
+@@ -568,6 +573,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -77954,7 +96281,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -575,10 +582,12 @@
+@@ -575,10 +581,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -77967,7 +96294,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -622,7 +631,7 @@
+@@ -622,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -77976,7 +96303,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +669,9 @@
+@@ -660,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -77998,7 +96325,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -296,6 +297,9 @@
+@@ -246,7 +247,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78008,7 +96343,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,6 +350,7 @@
+@@ -346,6 +349,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -78016,7 +96351,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -353,12 +358,9 @@
+@@ -353,12 +357,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -78029,7 +96364,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,10 +381,13 @@
+@@ -379,10 +380,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -78043,7 +96378,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -391,6 +396,7 @@
+@@ -391,6 +395,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -78051,7 +96386,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -552,6 +558,7 @@
+@@ -552,6 +557,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -78059,7 +96394,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -559,10 +566,12 @@
+@@ -559,10 +565,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -78072,7 +96407,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -598,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -78081,7 +96416,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -636,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78103,7 +96438,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78113,7 +96456,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -78121,7 +96464,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -78134,7 +96477,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -78148,7 +96491,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -78156,7 +96499,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -78164,7 +96507,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -78177,7 +96520,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -78186,7 +96529,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78208,7 +96551,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -303,6 +304,9 @@
+@@ -253,7 +254,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78218,7 +96569,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -78226,7 +96577,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -360,12 +365,9 @@
+@@ -360,12 +364,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -78239,7 +96590,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -386,10 +388,13 @@
+@@ -386,10 +387,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -78253,7 +96604,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -398,6 +403,7 @@
+@@ -398,6 +402,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -78261,7 +96612,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -559,6 +565,7 @@
+@@ -559,6 +564,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -78269,7 +96620,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -566,10 +573,12 @@
+@@ -566,10 +572,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -78282,7 +96633,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -605,7 +614,7 @@
+@@ -605,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -78291,7 +96642,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +652,9 @@
+@@ -643,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78303,49 +96654,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -936,18 +945,18 @@
- 
- 
- #>+ 3
--mediaapplet.moc: $(srcdir)/mediaapplet.h
--	$(MOC) $(srcdir)/mediaapplet.h -o mediaapplet.moc
-+preferencesdialog.moc: $(srcdir)/preferencesdialog.h
-+	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
- 
- #>+ 2
--mocs: mediaapplet.moc
-+mocs: preferencesdialog.moc
- 
- #>+ 3
--preferencesdialog.moc: $(srcdir)/preferencesdialog.h
--	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
-+mediaapplet.moc: $(srcdir)/mediaapplet.h
-+	$(MOC) $(srcdir)/mediaapplet.h -o mediaapplet.moc
- 
- #>+ 2
--mocs: preferencesdialog.moc
-+mocs: mediaapplet.moc
- 
- #>+ 3
- mediumbutton.moc: $(srcdir)/mediumbutton.h
-@@ -958,7 +967,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  mediaapplet.moc preferencesdialog.moc mediumbutton.moc
-+	-rm -f  preferencesdialog.moc mediaapplet.moc mediumbutton.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in mediaapplet.desktop Makefile.am 
-@@ -1009,7 +1018,7 @@
- 
- 
- #>+ 11
--media_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/preferencesdialog.cpp $(srcdir)/mediumbutton.cpp $(srcdir)/mediaapplet.cpp  preferencesdialog.moc mediaapplet.moc mediumbutton.moc
-+media_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/preferencesdialog.cpp $(srcdir)/mediumbutton.cpp $(srcdir)/mediaapplet.cpp  mediaapplet.moc preferencesdialog.moc mediumbutton.moc
- 	@echo 'creating media_panelapplet_la.all_cpp.cpp ...'; \
- 	rm -f media_panelapplet_la.all_cpp.files media_panelapplet_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> media_panelapplet_la.all_cpp.final; \
 --- kicker/applets/menu/Makefile.in
 +++ kicker/applets/menu/Makefile.in
 @@ -155,6 +155,7 @@
@@ -78356,7 +96664,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78366,7 +96682,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -78374,7 +96690,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -78387,7 +96703,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -78401,7 +96717,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -78409,7 +96725,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -78417,7 +96733,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -78430,7 +96746,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -603,7 +612,7 @@
+@@ -603,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -78439,7 +96755,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +650,9 @@
+@@ -641,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78461,7 +96777,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78471,7 +96795,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -78479,7 +96803,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -78492,7 +96816,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -78506,7 +96830,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -78514,7 +96838,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -78522,7 +96846,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -78535,7 +96859,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -611,7 +620,7 @@
+@@ -611,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -78544,7 +96868,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +658,9 @@
+@@ -649,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78566,7 +96890,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -304,6 +305,9 @@
+@@ -254,7 +255,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -304,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78576,7 +96908,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,6 +358,7 @@
+@@ -354,6 +357,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -78584,7 +96916,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -361,12 +366,9 @@
+@@ -361,12 +365,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -78597,7 +96929,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -387,10 +389,13 @@
+@@ -387,10 +388,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -78611,7 +96943,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -399,6 +404,7 @@
+@@ -399,6 +403,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -78619,7 +96951,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -560,6 +566,7 @@
+@@ -560,6 +565,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -78627,7 +96959,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -567,10 +574,12 @@
+@@ -567,10 +573,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -78640,7 +96972,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -616,7 +625,7 @@
+@@ -616,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -78649,7 +96981,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +663,9 @@
+@@ -654,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78671,7 +97003,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78681,7 +97021,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -78689,7 +97029,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -78702,7 +97042,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -78716,7 +97056,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -78724,7 +97064,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -78732,7 +97072,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -78745,7 +97085,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -78754,7 +97094,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78776,7 +97116,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -301,6 +302,9 @@
+@@ -251,7 +252,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78786,7 +97134,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,6 +355,7 @@
+@@ -351,6 +354,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -78794,7 +97142,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -358,12 +363,9 @@
+@@ -358,12 +362,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -78807,7 +97155,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -384,10 +386,13 @@
+@@ -384,10 +385,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -78821,7 +97169,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -396,6 +401,7 @@
+@@ -396,6 +400,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -78829,7 +97177,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -557,6 +563,7 @@
+@@ -557,6 +562,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -78837,7 +97185,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -564,10 +571,12 @@
+@@ -564,10 +570,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -78850,7 +97198,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -78859,7 +97207,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -78871,7 +97219,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -934,22 +943,22 @@
+@@ -934,22 +942,22 @@
  
  
  #>+ 3
@@ -78901,7 +97249,7 @@
  
  #>+ 2
  KDE_DIST=swallowapplet.desktop Makefile.in prefwidgetbase.ui Makefile.am 
-@@ -1005,7 +1014,7 @@
+@@ -1005,7 +1013,7 @@
  
  
  #>+ 11
@@ -78910,7 +97258,7 @@
  	@echo 'creating swallow_panelapplet_la.all_cpp.cpp ...'; \
  	rm -f swallow_panelapplet_la.all_cpp.files swallow_panelapplet_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> swallow_panelapplet_la.all_cpp.final; \
-@@ -1045,8 +1054,8 @@
+@@ -1045,8 +1053,8 @@
  swallow.o: swallow.moc 
  $(srcdir)/prefwidget.cpp: prefwidgetbase.h 
  nmcheck-am: nmcheck
@@ -78930,7 +97278,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -78940,7 +97296,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -78948,7 +97304,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -78961,7 +97317,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -78975,7 +97331,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -78983,7 +97339,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -78991,7 +97347,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -79004,7 +97360,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -606,7 +615,7 @@
+@@ -606,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -79013,7 +97369,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +653,9 @@
+@@ -644,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79035,7 +97391,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79045,7 +97409,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -79053,7 +97417,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -79066,7 +97430,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79080,7 +97444,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79088,7 +97452,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -79096,7 +97460,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -79109,7 +97473,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -79118,7 +97482,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79140,7 +97504,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -301,6 +302,9 @@
+@@ -251,7 +252,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79150,7 +97522,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,6 +355,7 @@
+@@ -351,6 +354,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -79158,7 +97530,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -358,12 +363,9 @@
+@@ -358,12 +362,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -79171,7 +97543,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -384,10 +386,13 @@
+@@ -384,10 +385,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79185,7 +97557,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -396,6 +401,7 @@
+@@ -396,6 +400,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79193,7 +97565,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -557,6 +563,7 @@
+@@ -557,6 +562,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -79201,7 +97573,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -564,10 +571,12 @@
+@@ -564,10 +570,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -79214,7 +97586,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -605,7 +614,7 @@
+@@ -605,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -79223,7 +97595,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +652,9 @@
+@@ -643,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79245,7 +97617,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79255,7 +97635,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -79263,7 +97643,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -79276,7 +97656,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79290,7 +97670,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79298,7 +97678,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -79306,7 +97686,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -79319,7 +97699,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -79328,7 +97708,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79350,7 +97730,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79360,7 +97748,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -79368,7 +97756,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -79381,7 +97769,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79395,7 +97783,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79403,7 +97791,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -79411,7 +97799,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -79424,7 +97812,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -79433,7 +97821,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79445,24 +97833,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -734,14 +743,14 @@
- 
- #>+ 10
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions/modified.png
- 	$(mkinstalldirs) $(DESTDIR)$(kickericonsdir)/locolor/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/lo16-action-modified.png $(DESTDIR)$(kickericonsdir)/locolor/16x16/actions/modified.png
-+	$(mkinstalldirs) $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-modified.png $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions/modified.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions/modified.png
- 	-rm -f $(DESTDIR)$(kickericonsdir)/locolor/16x16/actions/modified.png
-+	-rm -f $(DESTDIR)$(kickericonsdir)/crystalsvg/16x16/actions/modified.png
- 
- #>+ 15
- force-reedit:
 --- kicker/data/icons/Makefile.in
 +++ kicker/data/icons/Makefile.in
 @@ -123,6 +123,7 @@
@@ -79473,7 +97843,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79483,7 +97861,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -79491,7 +97869,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -79504,7 +97882,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79518,7 +97896,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79526,7 +97904,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -79534,7 +97912,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -79547,7 +97925,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -560,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -79556,7 +97934,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -598,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79568,42 +97946,39 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -898,27 +907,27 @@
+@@ -898,27 +906,27 @@
  
  #>+ 23
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/cr48-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kicker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kdisknav.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-window_list.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-panel.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
  
  uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdisknav.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdisknav.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/window_list.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kicker.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdisknav.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/window_list.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/window_list.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/panel.png
  
  #>+ 15
  force-reedit:
@@ -79617,7 +97992,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79627,7 +98010,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -79635,7 +98018,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -79648,7 +98031,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79662,7 +98045,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79670,7 +98053,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -79678,7 +98061,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -79691,7 +98074,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -79700,7 +98083,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79722,7 +98105,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79732,7 +98123,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -79740,7 +98131,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -79753,7 +98144,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79767,7 +98158,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79775,7 +98166,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -79783,7 +98174,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -79796,7 +98187,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -79805,7 +98196,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79827,7 +98218,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79837,7 +98236,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -79845,7 +98244,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -79858,7 +98257,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79872,7 +98271,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79880,7 +98279,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -79888,7 +98287,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -79901,7 +98300,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -606,7 +615,7 @@
+@@ -606,7 +614,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -79910,7 +98309,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +653,9 @@
+@@ -644,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -79922,12 +98321,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -806,7 +815,7 @@
+@@ -806,7 +814,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png KDE_button_tiny_up.png solid_tigereye_normal_down.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png KDE_button_normal_down.png green_wood_tiny_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_tigereye_tiny_up.png solid_gray_large_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png solid_gray_large_down.png light_pastel_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png light_pastel_normal_up.png solid_gray_normal_down.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png 
-+KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png solid_tigereye_normal_down.png KDE_button_tiny_up.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png KDE_button_normal_down.png green_wood_tiny_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_gray_large_up.png solid_tigereye_tiny_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png light_pastel_large_down.png solid_gray_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png light_pastel_normal_up.png solid_gray_normal_down.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png 
++KDE_DIST=light_pastel_tiny_up.png nuts_and_bolts_large_down.png KDE_button_normal_up.png light_gray_large_up.png green_wood_large_up.png KDE_button_tiny_up.png solid_tigereye_normal_down.png blue_wood_normal_down.png solid_red_large_down.png light_gray_large_down.png solid_purple_tiny_down.png nuts_and_bolts_tiny_up.png green_wood_normal_up.png solid_green_tiny_up.png red_wood_tiny_down.png solid_gray_tiny_down.png solid_pastel_large_up.png solid_orange_tiny_down.png solid_pastel_normal_up.png light_purple_normal_up.png solid_blue_large_up.png solid_pastel_tiny_up.png Makefile.in light_green_tiny_down.png KDE_button_large_down.png solid_blue_normal_down.png solid_red_tiny_up.png solid_orange_large_up.png red_wood_tiny_up.png solid_orange_large_down.png KDE_button_normal_down.png green_wood_tiny_down.png light_pastel_tiny_down.png solid_red_tiny_down.png light_gray_normal_up.png solid_orange_normal_down.png solid_red_large_up.png solid_green_large_down.png solid_tigereye_large_up.png solid_tigereye_tiny_down.png light_green_tiny_up.png solid_green_large_up.png green_wood_normal_down.png light_green_large_up.png solid_gray_normal_up.png solid_blue_tiny_up.png blue_wood_tiny_up.png solid_gray_tiny_up.png solid_pastel_normal_down.png nuts_and_bolts_tiny_down.png light_purple_normal_down.png red_wood_large_down.png solid_blue_normal_up.png solid_tigereye_large_down.png solid_green_normal_down.png KDE_button_tiny_down.png solid_orange_tiny_up.png solid_purple_large_down.png solid_pastel_tiny_down.png solid_purple_large_up.png light_purple_large_down.png blue_wood_tiny_down.png solid_gray_large_up.png solid_tigereye_tiny_up.png solid_purple_tiny_up.png solid_red_normal_down.png solid_green_normal_up.png blue_wood_large_up.png green_wood_tiny_up.png light_pastel_large_up.png light_gray_tiny_up.png solid_purple_normal_up.png solid_gray_large_down.png light_pastel_large_down.png blue_wood_large_down.png nuts_and_bolts_large_up.png light_purple_tiny_down.png light_green_normal_down.png red_wood_normal_down.png nuts_and_bolts_normal_up.png solid_blue_large_down.png red_wood_large_up.png solid_green_tiny_down.png solid_blue_tiny_down.png red_wood_normal_up.png light_green_large_down.png light_green_normal_up.png solid_orange_normal_up.png solid_red_normal_up.png solid_tigereye_normal_up.png light_purple_tiny_up.png solid_gray_normal_down.png light_pastel_normal_up.png KDE_button_large_up.png light_purple_large_up.png nuts_and_bolts_normal_down.png solid_purple_normal_down.png green_wood_large_down.png light_gray_tiny_down.png solid_pastel_large_down.png Makefile.am blue_wood_normal_up.png 
  
  #>+ 2
  docs-am:
@@ -79941,7 +98340,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -79951,7 +98358,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -79959,7 +98366,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -79972,7 +98379,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -79986,7 +98393,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -79994,7 +98401,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -80002,7 +98409,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -80015,7 +98422,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -80024,7 +98431,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80046,7 +98453,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80056,7 +98471,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -80064,7 +98479,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -80077,7 +98492,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80091,7 +98506,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80099,7 +98514,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -80107,7 +98522,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -80120,7 +98535,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80129,7 +98544,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80151,7 +98566,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -323,6 +324,9 @@
+@@ -273,7 +274,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -323,6 +323,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80161,7 +98584,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -373,6 +377,7 @@
+@@ -373,6 +376,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -80169,7 +98592,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -380,12 +385,9 @@
+@@ -380,12 +384,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -80182,7 +98605,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -406,10 +408,13 @@
+@@ -406,10 +407,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80196,7 +98619,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -418,6 +423,7 @@
+@@ -418,6 +422,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80204,7 +98627,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -579,6 +585,7 @@
+@@ -579,6 +584,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -80212,7 +98635,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -586,10 +593,12 @@
+@@ -586,10 +592,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -80225,7 +98648,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -655,7 +664,7 @@
+@@ -655,7 +663,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80234,7 +98657,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -693,9 +702,9 @@
+@@ -693,9 +701,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80246,37 +98669,40 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1102,18 +1111,18 @@
+@@ -1102,6 +1110,13 @@
  mocs: kasbarextension.moc
  
  #>+ 3
--kasclockitem.moc: $(srcdir)/kasclockitem.h
--	$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
-+kasitem.moc: $(srcdir)/kasitem.h
-+	$(MOC) $(srcdir)/kasitem.h -o kasitem.moc
++kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
++	$(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
++
++#>+ 2
++mocs: kasaboutdlg.moc
++
++#>+ 3
+ kasclockitem.moc: $(srcdir)/kasclockitem.h
+ 	$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
  
- #>+ 2
--mocs: kasclockitem.moc
-+mocs: kasitem.moc
+@@ -1116,13 +1131,6 @@
+ mocs: kasitem.moc
  
  #>+ 3
--kasitem.moc: $(srcdir)/kasitem.h
--	$(MOC) $(srcdir)/kasitem.h -o kasitem.moc
-+kasclockitem.moc: $(srcdir)/kasclockitem.h
-+	$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
+-kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
+-	$(MOC) $(srcdir)/kasaboutdlg.h -o kasaboutdlg.moc
+-
+-#>+ 2
+-mocs: kasaboutdlg.moc
+-
+-#>+ 3
+ kasresources.moc: $(srcdir)/kasresources.h
+ 	$(MOC) $(srcdir)/kasresources.h -o kasresources.moc
  
- #>+ 2
--mocs: kasitem.moc
-+mocs: kasclockitem.moc
+@@ -1182,7 +1190,7 @@
  
  #>+ 3
- kasaboutdlg.moc: $(srcdir)/kasaboutdlg.h
-@@ -1182,7 +1191,7 @@
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasclockitem.moc kasitem.moc kasaboutdlg.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
-+	-rm -f  kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasitem.moc kasclockitem.moc kasaboutdlg.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
++	-rm -f  kasgroupitem.moc kastaskitem.moc kastasker.moc kasbarextension.moc kasaboutdlg.moc kasclockitem.moc kasitem.moc kasresources.moc kaspopup.moc kasloaditem.moc kasbar.moc kasprefsdlg.moc kastaskpopup.moc kasstartupitem.moc
  
  #>+ 2
  KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile configure.in.in docs.h kastaskpopup.h kasbarextension.desktop Makefile.am 
@@ -80290,7 +98716,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80300,7 +98734,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -80308,7 +98742,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -80321,7 +98755,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80335,7 +98769,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80343,7 +98777,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -80351,7 +98785,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -80364,7 +98798,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -80373,7 +98807,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80395,7 +98829,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -295,6 +296,9 @@
+@@ -245,7 +246,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80405,7 +98847,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,6 +349,7 @@
+@@ -345,6 +348,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -80413,7 +98855,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -352,12 +357,9 @@
+@@ -352,12 +356,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -80426,7 +98868,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,10 +380,13 @@
+@@ -378,10 +379,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80440,7 +98882,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -390,6 +395,7 @@
+@@ -390,6 +394,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80448,7 +98890,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -551,6 +557,7 @@
+@@ -551,6 +556,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -80456,7 +98898,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -558,10 +565,12 @@
+@@ -558,10 +564,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -80469,7 +98911,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -595,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80478,7 +98920,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -633,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80500,7 +98942,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -303,6 +304,9 @@
+@@ -253,7 +254,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80510,7 +98960,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -80518,7 +98968,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -360,12 +365,9 @@
+@@ -360,12 +364,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -80531,7 +98981,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -386,10 +388,13 @@
+@@ -386,10 +387,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80545,7 +98995,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -398,6 +403,7 @@
+@@ -398,6 +402,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80553,7 +99003,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -559,6 +565,7 @@
+@@ -559,6 +564,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -80561,7 +99011,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -566,10 +573,12 @@
+@@ -566,10 +572,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -80574,7 +99024,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -611,7 +620,7 @@
+@@ -611,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80583,7 +99033,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +658,9 @@
+@@ -649,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80605,7 +99055,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -303,6 +304,9 @@
+@@ -253,7 +254,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80615,7 +99073,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -80623,7 +99081,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -360,12 +365,9 @@
+@@ -360,12 +364,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -80636,7 +99094,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -386,10 +388,13 @@
+@@ -386,10 +387,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80650,7 +99108,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -398,6 +403,7 @@
+@@ -398,6 +402,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80658,7 +99116,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -559,6 +565,7 @@
+@@ -559,6 +564,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -80666,7 +99124,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -566,10 +573,12 @@
+@@ -566,10 +572,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -80679,7 +99137,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -612,7 +621,7 @@
+@@ -612,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80688,7 +99146,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +659,9 @@
+@@ -650,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80700,65 +99158,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -939,18 +948,18 @@
- mocs: urlbutton.moc
- 
- #>+ 3
--extensionbutton.moc: $(srcdir)/extensionbutton.h
--	$(MOC) $(srcdir)/extensionbutton.h -o extensionbutton.moc
-+windowlistbutton.moc: $(srcdir)/windowlistbutton.h
-+	$(MOC) $(srcdir)/windowlistbutton.h -o windowlistbutton.moc
- 
- #>+ 2
--mocs: extensionbutton.moc
-+mocs: windowlistbutton.moc
- 
- #>+ 3
--windowlistbutton.moc: $(srcdir)/windowlistbutton.h
--	$(MOC) $(srcdir)/windowlistbutton.h -o windowlistbutton.moc
-+extensionbutton.moc: $(srcdir)/extensionbutton.h
-+	$(MOC) $(srcdir)/extensionbutton.h -o extensionbutton.moc
- 
- #>+ 2
--mocs: windowlistbutton.moc
-+mocs: extensionbutton.moc
- 
- #>+ 3
- servicebutton.moc: $(srcdir)/servicebutton.h
-@@ -960,6 +969,13 @@
+@@ -960,11 +968,11 @@
  mocs: servicebutton.moc
  
  #>+ 3
+-kbutton.moc: $(srcdir)/kbutton.h
+-	$(MOC) $(srcdir)/kbutton.h -o kbutton.moc
 +desktopbutton.moc: $(srcdir)/desktopbutton.h
 +	$(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: kbutton.moc
 +mocs: desktopbutton.moc
-+
-+#>+ 3
- kbutton.moc: $(srcdir)/kbutton.h
- 	$(MOC) $(srcdir)/kbutton.h -o kbutton.moc
  
-@@ -974,13 +990,6 @@
+ #>+ 3
+ servicemenubutton.moc: $(srcdir)/servicemenubutton.h
+@@ -974,11 +982,11 @@
  mocs: servicemenubutton.moc
  
  #>+ 3
 -desktopbutton.moc: $(srcdir)/desktopbutton.h
 -	$(MOC) $(srcdir)/desktopbutton.h -o desktopbutton.moc
--
--#>+ 2
++kbutton.moc: $(srcdir)/kbutton.h
++	$(MOC) $(srcdir)/kbutton.h -o kbutton.moc
+ 
+ #>+ 2
 -mocs: desktopbutton.moc
--
--#>+ 3
++mocs: kbutton.moc
+ 
+ #>+ 3
  nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
- 	$(MOC) $(srcdir)/nonkdeappbutton.h -o nonkdeappbutton.moc
+@@ -996,10 +1004,10 @@
  
-@@ -996,10 +1005,10 @@
- 
  #>+ 3
  clean-metasources:
 -	-rm -f  browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
-+	-rm -f  browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc desktopbutton.moc kbutton.moc servicemenubutton.moc nonkdeappbutton.moc bookmarksbutton.moc
++	-rm -f  browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
  
  #>+ 2
 -KDE_DIST=servicemenubutton.h servicebutton.h kmenu.desktop windowlistbutton.h Makefile.in desktopbutton.h urlbutton.h nonkdeappbutton.h bookmarks.desktop bookmarksbutton.h extensionbutton.h browserbutton.h desktop.desktop browser.desktop kbutton.h exec.desktop Makefile.am windowlist.desktop 
@@ -80766,16 +99201,16 @@
  
  #>+ 2
  docs-am:
-@@ -1043,7 +1052,7 @@
+@@ -1043,7 +1051,7 @@
  
  
  #>+ 11
 -libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/desktopbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/windowlistbutton.cpp  browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc desktopbutton.moc servicemenubutton.moc kbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
-+libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/desktopbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/windowlistbutton.cpp  browserbutton.moc urlbutton.moc extensionbutton.moc windowlistbutton.moc servicebutton.moc servicemenubutton.moc kbutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
++libkicker_buttons_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/servicebutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/bookmarksbutton.cpp $(srcdir)/browserbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/desktopbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionbutton.cpp $(srcdir)/kbutton.cpp $(srcdir)/nonkdeappbutton.cpp $(srcdir)/servicemenubutton.cpp $(srcdir)/urlbutton.cpp  ../../libkicker/kickerSettings.h $(srcdir)/windowlistbutton.cpp  browserbutton.moc urlbutton.moc windowlistbutton.moc extensionbutton.moc servicebutton.moc kbutton.moc servicemenubutton.moc desktopbutton.moc nonkdeappbutton.moc bookmarksbutton.moc
  	@echo 'creating libkicker_buttons_la.all_cpp.cpp ...'; \
  	rm -f libkicker_buttons_la.all_cpp.files libkicker_buttons_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkicker_buttons_la.all_cpp.final; \
-@@ -1082,8 +1091,8 @@
+@@ -1082,8 +1090,8 @@
  extensionbutton.o: extensionbutton.moc 
  urlbutton.o: urlbutton.moc 
  nonkdeappbutton.lo: nonkdeappbutton.moc 
@@ -80795,7 +99230,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -308,6 +309,9 @@
+@@ -258,7 +259,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -308,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80805,7 +99248,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -358,6 +362,7 @@
+@@ -358,6 +361,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -80813,7 +99256,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -365,12 +370,9 @@
+@@ -365,12 +369,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -80826,7 +99269,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -391,10 +393,13 @@
+@@ -391,10 +392,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -80840,7 +99283,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -403,6 +408,7 @@
+@@ -403,6 +407,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -80848,7 +99291,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -564,6 +570,7 @@
+@@ -564,6 +569,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -80856,7 +99299,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -571,10 +578,12 @@
+@@ -571,10 +577,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -80869,7 +99312,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -631,7 +640,7 @@
+@@ -631,7 +639,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -80878,7 +99321,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -669,9 +678,9 @@
+@@ -669,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -80890,32 +99333,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -1013,18 +1022,18 @@
- mocs: applethandle.moc
+@@ -985,18 +993,18 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub panelextension.kidl
  
  #>+ 3
--containerarea.moc: $(srcdir)/containerarea.h
--	$(MOC) $(srcdir)/containerarea.h -o containerarea.moc
-+menumanager.moc: $(srcdir)/menumanager.h
-+	$(MOC) $(srcdir)/menumanager.h -o menumanager.moc
+-container_extension.moc: $(srcdir)/container_extension.h
+-	$(MOC) $(srcdir)/container_extension.h -o container_extension.moc
++container_base.moc: $(srcdir)/container_base.h
++	$(MOC) $(srcdir)/container_base.h -o container_base.moc
  
  #>+ 2
--mocs: containerarea.moc
-+mocs: menumanager.moc
+-mocs: container_extension.moc
++mocs: container_base.moc
  
  #>+ 3
--menumanager.moc: $(srcdir)/menumanager.h
--	$(MOC) $(srcdir)/menumanager.h -o menumanager.moc
-+containerarea.moc: $(srcdir)/containerarea.h
-+	$(MOC) $(srcdir)/containerarea.h -o containerarea.moc
+-container_base.moc: $(srcdir)/container_base.h
+-	$(MOC) $(srcdir)/container_base.h -o container_base.moc
++container_extension.moc: $(srcdir)/container_extension.h
++	$(MOC) $(srcdir)/container_extension.h -o container_extension.moc
  
  #>+ 2
--mocs: menumanager.moc
-+mocs: containerarea.moc
+-mocs: container_base.moc
++mocs: container_extension.moc
  
  #>+ 3
- pluginmanager.moc: $(srcdir)/pluginmanager.h
-@@ -1034,18 +1043,18 @@
+ container_applet.moc: $(srcdir)/container_applet.h
+@@ -1034,18 +1042,18 @@
  mocs: pluginmanager.moc
  
  #>+ 3
@@ -80940,21 +99383,46 @@
  
  #>+ 3
  showdesktop.moc: $(srcdir)/showdesktop.h
-@@ -1084,7 +1093,7 @@
+@@ -1062,18 +1070,18 @@
+ mocs: extensionmanager.moc
  
  #>+ 3
+-kicker.moc: $(srcdir)/kicker.h
+-	$(MOC) $(srcdir)/kicker.h -o kicker.moc
++panelextension.moc: $(srcdir)/panelextension.h
++	$(MOC) $(srcdir)/panelextension.h -o panelextension.moc
+ 
+ #>+ 2
+-mocs: kicker.moc
++mocs: panelextension.moc
+ 
+ #>+ 3
+-panelextension.moc: $(srcdir)/panelextension.h
+-	$(MOC) $(srcdir)/panelextension.h -o panelextension.moc
++kicker.moc: $(srcdir)/kicker.h
++	$(MOC) $(srcdir)/kicker.h -o kicker.moc
+ 
+ #>+ 2
+-mocs: panelextension.moc
++mocs: kicker.moc
+ 
+ #>+ 3
+ userrectsel.moc: $(srcdir)/userrectsel.h
+@@ -1084,7 +1092,7 @@
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  container_extension.moc container_base.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
-+	-rm -f  container_extension.moc container_base.moc container_applet.moc applethandle.moc menumanager.moc containerarea.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
++	-rm -f  container_base.moc container_extension.moc container_applet.moc applethandle.moc containerarea.moc menumanager.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
  
  #>+ 2
  KDE_DIST=extensionmanager.h kicker.h container_extension.h showdesktop.h menumanager.h container_button.h Makefile.in panelextension.h default-apps extensionSettings.kcfgc childpanelextension.desktop unhidetrigger.h applethandle.h container_base.h extensionSettings.kcfg kickerbindings.cpp pluginmanager.h containerarea.h containerarealayout.h container_applet.h userrectsel.h Makefile.am 
-@@ -1142,7 +1151,7 @@
+@@ -1142,7 +1150,7 @@
  
  
  #>+ 11
 -libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp  ../../libkicker/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp  ../../libkicker/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp  ../../libkicker/kickerSettings.h $(srcdir)/container_extension.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp  ../../libkicker/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp  container_base.moc container_extension.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc unhidetrigger.moc container_button.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
-+libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp  ../../libkicker/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp  ../../libkicker/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp  ../../libkicker/kickerSettings.h $(srcdir)/container_extension.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp  ../../libkicker/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp  container_base.moc container_extension.moc applethandle.moc container_applet.moc containerarea.moc menumanager.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc panelextension.moc kicker.moc userrectsel.moc
++libkicker_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kicker.cpp  ../../libkicker/kickerSettings.h $(srcdir)/userrectsel.cpp $(srcdir)/containerarea.cpp  ../../libkicker/kickerSettings.h $(srcdir)/applethandle.cpp $(srcdir)/container_base.cpp $(srcdir)/container_button.cpp $(srcdir)/container_applet.cpp  ../../libkicker/kickerSettings.h $(srcdir)/container_extension.cpp  ../../libkicker/kickerSettings.h $(srcdir)/extensionmanager.cpp $(srcdir)/menumanager.cpp $(srcdir)/pluginmanager.cpp $(srcdir)/showdesktop.cpp  ../../libkicker/kickerSettings.h $(srcdir)/unhidetrigger.cpp $(srcdir)/containerarealayout.cpp $(srcdir)/panelextension.cpp kicker_skel.cpp panelextension_skel.cpp extensionSettings.cpp  container_extension.moc container_base.moc applethandle.moc container_applet.moc menumanager.moc containerarea.moc pluginmanager.moc container_button.moc unhidetrigger.moc showdesktop.moc extensionmanager.moc kicker.moc panelextension.moc userrectsel.moc
  	@echo 'creating libkicker_core_la.all_cpp.cpp ...'; \
  	rm -f libkicker_core_la.all_cpp.files libkicker_core_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkicker_core_la.all_cpp.final; \
@@ -80968,7 +99436,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -346,6 +347,9 @@
+@@ -296,7 +297,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -346,6 +346,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -80978,7 +99454,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -396,6 +400,7 @@
+@@ -396,6 +399,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -80986,7 +99462,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -403,12 +408,9 @@
+@@ -403,12 +407,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -80999,7 +99475,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -429,10 +431,13 @@
+@@ -429,10 +430,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81013,7 +99489,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -441,6 +446,7 @@
+@@ -441,6 +445,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81021,7 +99497,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -602,6 +608,7 @@
+@@ -602,6 +607,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -81029,7 +99505,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -609,10 +616,12 @@
+@@ -609,10 +615,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -81042,7 +99518,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -662,7 +671,7 @@
+@@ -662,7 +670,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81051,7 +99527,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -700,9 +709,9 @@
+@@ -700,9 +708,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81073,7 +99549,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81083,7 +99567,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -81091,7 +99575,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -81104,7 +99588,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81118,7 +99602,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81126,7 +99610,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -81134,7 +99618,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -81147,7 +99631,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -631,7 +640,7 @@
+@@ -631,7 +639,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81156,7 +99640,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -669,9 +678,9 @@
+@@ -669,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81168,78 +99652,80 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -953,6 +962,13 @@
+@@ -953,11 +961,11 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub k_mnu.kidl
  
  #>+ 3
+-appletwidget.moc: $(srcdir)/appletwidget.h
+-	$(MOC) $(srcdir)/appletwidget.h -o appletwidget.moc
 +addapplet.moc: $(srcdir)/addapplet.h
 +	$(MOC) $(srcdir)/addapplet.h -o addapplet.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: appletwidget.moc
 +mocs: addapplet.moc
-+
-+#>+ 3
- appletwidget.moc: $(srcdir)/appletwidget.h
- 	$(MOC) $(srcdir)/appletwidget.h -o appletwidget.moc
  
-@@ -967,13 +983,6 @@
+ #>+ 3
+ exe_dlg.moc: $(srcdir)/exe_dlg.h
+@@ -967,11 +975,11 @@
  mocs: exe_dlg.moc
  
  #>+ 3
 -addapplet.moc: $(srcdir)/addapplet.h
 -	$(MOC) $(srcdir)/addapplet.h -o addapplet.moc
--
--#>+ 2
++appletwidget.moc: $(srcdir)/appletwidget.h
++	$(MOC) $(srcdir)/appletwidget.h -o appletwidget.moc
+ 
+ #>+ 2
 -mocs: addapplet.moc
--
--#>+ 3
++mocs: appletwidget.moc
+ 
+ #>+ 3
  hidebutton.moc: $(srcdir)/hidebutton.h
- 	$(MOC) $(srcdir)/hidebutton.h -o hidebutton.moc
+@@ -1065,18 +1073,18 @@
+ mocs: addappletvisualfeedback.moc
  
-@@ -1058,18 +1067,18 @@
- mocs: removebutton_mnu.moc
+ #>+ 3
+-client_mnu.moc: $(srcdir)/client_mnu.h
+-	$(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
++quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
++	$(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
  
+ #>+ 2
+-mocs: client_mnu.moc
++mocs: quickbrowser_mnu.moc
+ 
  #>+ 3
--addappletvisualfeedback.moc: $(srcdir)/addappletvisualfeedback.h
--	$(MOC) $(srcdir)/addappletvisualfeedback.h -o addappletvisualfeedback.moc
+-quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
+-	$(MOC) $(srcdir)/quickbrowser_mnu.h -o quickbrowser_mnu.moc
 +client_mnu.moc: $(srcdir)/client_mnu.h
 +	$(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
  
  #>+ 2
--mocs: addappletvisualfeedback.moc
+-mocs: quickbrowser_mnu.moc
 +mocs: client_mnu.moc
  
  #>+ 3
--client_mnu.moc: $(srcdir)/client_mnu.h
--	$(MOC) $(srcdir)/client_mnu.h -o client_mnu.moc
-+addappletvisualfeedback.moc: $(srcdir)/addappletvisualfeedback.h
-+	$(MOC) $(srcdir)/addappletvisualfeedback.h -o addappletvisualfeedback.moc
+ addextension_mnu.moc: $(srcdir)/addextension_mnu.h
+@@ -1087,7 +1095,7 @@
  
- #>+ 2
--mocs: client_mnu.moc
-+mocs: addappletvisualfeedback.moc
- 
  #>+ 3
- quickbrowser_mnu.moc: $(srcdir)/quickbrowser_mnu.h
-@@ -1087,7 +1096,7 @@
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  appletwidget.moc exe_dlg.moc addapplet.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc addappletvisualfeedback.moc client_mnu.moc quickbrowser_mnu.moc addextension_mnu.moc
-+	-rm -f  addapplet.moc appletwidget.moc exe_dlg.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc client_mnu.moc addappletvisualfeedback.moc quickbrowser_mnu.moc addextension_mnu.moc
++	-rm -f  addapplet.moc exe_dlg.moc appletwidget.moc hidebutton.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc addbutton_mnu.moc removebutton_mnu.moc addappletvisualfeedback.moc quickbrowser_mnu.moc client_mnu.moc addextension_mnu.moc
  
  #>+ 2
  KDE_DIST=Makefile.in appletitem.ui nonKDEButtonSettings.ui panelmenuiteminfo.h appletview.ui Makefile.am 
-@@ -1146,7 +1155,7 @@
+@@ -1146,7 +1154,7 @@
  
  
  #>+ 11
 -libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/addextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/recentapps.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp $(srcdir)/addappletvisualfeedback.cpp k_mnu_skel.cpp appletitem.cpp appletview.cpp nonKDEButtonSettings.cpp  addapplet.moc exe_dlg.moc appletwidget.moc appletview.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc appletitem.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc removebutton_mnu.moc addbutton_mnu.moc quickbrowser_mnu.moc client_mnu.moc addappletvisualfeedback.moc addextension_mnu.moc
-+libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/addextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/recentapps.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp $(srcdir)/addappletvisualfeedback.cpp k_mnu_skel.cpp appletitem.cpp appletview.cpp nonKDEButtonSettings.cpp  exe_dlg.moc appletwidget.moc addapplet.moc appletview.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc appletitem.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc removebutton_mnu.moc addbutton_mnu.moc quickbrowser_mnu.moc addappletvisualfeedback.moc client_mnu.moc addextension_mnu.moc
++libkicker_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/addbutton_mnu.cpp $(srcdir)/addapplet.cpp $(srcdir)/addapplet_mnu.cpp $(srcdir)/appletop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/client_mnu.cpp $(srcdir)/dirdrop_mnu.cpp $(srcdir)/exe_dlg.cpp $(srcdir)/k_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/quickbrowser_mnu.cpp $(srcdir)/service_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/addextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/extensionop_mnu.cpp  ../../libkicker/kickerSettings.h $(srcdir)/recentapps.cpp  ../../libkicker/kickerSettings.h $(srcdir)/browser_dlg.cpp $(srcdir)/removeapplet_mnu.cpp $(srcdir)/removeextension_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removecontainer_mnu.cpp  ../core/extensionSettings.h $(srcdir)/removebutton_mnu.cpp $(srcdir)/popupmenutitle.cpp $(srcdir)/hidebutton.cpp $(srcdir)/addappletvisualfeedback.cpp k_mnu_skel.cpp appletitem.cpp appletview.cpp nonKDEButtonSettings.cpp  appletwidget.moc exe_dlg.moc addapplet.moc appletview.moc hidebutton.moc nonKDEButtonSettings.moc browser_mnu.moc appletop_mnu.moc k_mnu.moc removecontainer_mnu.moc removeapplet_mnu.moc appletitem.moc removeextension_mnu.moc addapplet_mnu.moc browser_dlg.moc service_mnu.moc removebutton_mnu.moc addbutton_mnu.moc client_mnu.moc quickbrowser_mnu.moc addappletvisualfeedback.moc addextension_mnu.moc
  	@echo 'creating libkicker_ui_la.all_cpp.cpp ...'; \
  	rm -f libkicker_ui_la.all_cpp.files libkicker_ui_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkicker_ui_la.all_cpp.final; \
-@@ -1187,7 +1196,7 @@
+@@ -1187,7 +1195,7 @@
  addappletvisualfeedback.o: addappletvisualfeedback.moc 
  addextension_mnu.o: addextension_mnu.moc 
  browser_dlg.lo: browser_dlg.moc 
@@ -81248,7 +99734,7 @@
  appletop_mnu.o: appletop_mnu.moc 
  $(srcdir)/extensionop_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
  $(srcdir)/addappletvisualfeedback.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
-@@ -1197,7 +1206,7 @@
+@@ -1197,7 +1205,7 @@
  $(srcdir)/removecontainer_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
  $(srcdir)/removeextension_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
  addbutton_mnu.o: addbutton_mnu.moc 
@@ -81267,7 +99753,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81277,7 +99771,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -81285,7 +99779,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -81298,7 +99792,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81312,7 +99806,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81320,7 +99814,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -81328,7 +99822,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -81341,7 +99835,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -612,7 +621,7 @@
+@@ -612,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81350,7 +99844,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +659,9 @@
+@@ -650,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81362,6 +99856,55 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -960,22 +968,22 @@
+ mocs: panelbutton.moc
+ 
+ #>+ 3
+-simplebutton.moc: $(srcdir)/simplebutton.h
+-	$(MOC) $(srcdir)/simplebutton.h -o simplebutton.moc
++kickertip.moc: $(srcdir)/kickertip.h
++	$(MOC) $(srcdir)/kickertip.h -o kickertip.moc
+ 
+ #>+ 2
+-mocs: simplebutton.moc
++mocs: kickertip.moc
+ 
+ #>+ 3
+-kickertip.moc: $(srcdir)/kickertip.h
+-	$(MOC) $(srcdir)/kickertip.h -o kickertip.moc
++simplebutton.moc: $(srcdir)/simplebutton.h
++	$(MOC) $(srcdir)/simplebutton.h -o simplebutton.moc
+ 
+ #>+ 2
+-mocs: kickertip.moc
++mocs: simplebutton.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  panner.moc panelbutton.moc simplebutton.moc kickertip.moc
++	-rm -f  panner.moc panelbutton.moc kickertip.moc simplebutton.moc
+ 
+ #>+ 2
+ KDE_DIST=menuinfo.h paneldrag.h simplebutton.h global.h panelbutton.h Makefile.in kickerSettings.kcfgc kickertip.h kshadowengine.h panner.h kshadowsettings.h kickerSettings.kcfg appletinfo.h Makefile.am 
+@@ -1031,7 +1039,7 @@
+ 
+ 
+ #>+ 11
+-libkickermain_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletinfo.cpp $(srcdir)/global.cpp $(srcdir)/kickertip.cpp $(srcdir)/menuinfo.cpp $(srcdir)/panelbutton.cpp $(srcdir)/panner.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kshadowengine.cpp $(srcdir)/paneldrag.cpp $(srcdir)/simplebutton.cpp kickerSettings.cpp  panner.moc panelbutton.moc kickertip.moc simplebutton.moc
++libkickermain_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletinfo.cpp $(srcdir)/global.cpp $(srcdir)/kickertip.cpp $(srcdir)/menuinfo.cpp $(srcdir)/panelbutton.cpp $(srcdir)/panner.cpp $(srcdir)/kshadowsettings.cpp $(srcdir)/kshadowengine.cpp $(srcdir)/paneldrag.cpp $(srcdir)/simplebutton.cpp kickerSettings.cpp  panner.moc panelbutton.moc simplebutton.moc kickertip.moc
+ 	@echo 'creating libkickermain_la.all_cpp.cpp ...'; \
+ 	rm -f libkickermain_la.all_cpp.files libkickermain_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkickermain_la.all_cpp.final; \
+@@ -1085,8 +1093,8 @@
+ simplebutton.lo: simplebutton.moc 
+ $(srcdir)/simplebutton.cpp: kickerSettings.h 
+ $(srcdir)/paneldrag.cpp: kickerSettings.h 
+-$(srcdir)/panelbutton.cpp: kickerSettings.h 
+ panner.lo: panner.moc 
++$(srcdir)/panelbutton.cpp: kickerSettings.h 
+ 
+ #>+ 6
+ kickerSettings.cpp: kickerSettings.h
 --- kicker/Makefile.in
 +++ kicker/Makefile.in
 @@ -124,6 +124,7 @@
@@ -81372,7 +99915,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -268,6 +269,9 @@
+@@ -218,7 +219,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -268,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81382,7 +99933,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -318,6 +322,7 @@
+@@ -318,6 +321,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -81390,7 +99941,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -325,12 +330,9 @@
+@@ -325,12 +329,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -81403,7 +99954,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -351,10 +353,13 @@
+@@ -351,10 +352,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81417,7 +99968,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -363,6 +368,7 @@
+@@ -363,6 +367,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81425,7 +99976,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -524,6 +530,7 @@
+@@ -524,6 +529,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -81433,7 +99984,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -531,10 +538,12 @@
+@@ -531,10 +537,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -81446,7 +99997,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -560,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -81455,7 +100006,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -598,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81477,7 +100028,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -295,6 +296,9 @@
+@@ -245,7 +246,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81487,7 +100046,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,6 +349,7 @@
+@@ -345,6 +348,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -81495,7 +100054,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -352,12 +357,9 @@
+@@ -352,12 +356,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -81508,7 +100067,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,10 +380,13 @@
+@@ -378,10 +379,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81522,7 +100081,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -390,6 +395,7 @@
+@@ -390,6 +394,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81530,7 +100089,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -551,6 +557,7 @@
+@@ -551,6 +556,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -81538,7 +100097,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -558,10 +565,12 @@
+@@ -558,10 +564,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -81551,7 +100110,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -597,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81560,7 +100119,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -635,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81582,7 +100141,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -295,6 +296,9 @@
+@@ -245,7 +246,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81592,7 +100159,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,6 +349,7 @@
+@@ -345,6 +348,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -81600,7 +100167,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -352,12 +357,9 @@
+@@ -352,12 +356,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -81613,7 +100180,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,10 +380,13 @@
+@@ -378,10 +379,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81627,7 +100194,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -390,6 +395,7 @@
+@@ -390,6 +394,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81635,7 +100202,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -551,6 +557,7 @@
+@@ -551,6 +556,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -81643,7 +100210,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -558,10 +565,12 @@
+@@ -558,10 +564,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -81656,7 +100223,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -595,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81665,7 +100232,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -633,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81687,7 +100254,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -296,6 +297,9 @@
+@@ -246,7 +247,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81697,7 +100272,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,6 +350,7 @@
+@@ -346,6 +349,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -81705,7 +100280,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -353,12 +358,9 @@
+@@ -353,12 +357,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -81718,7 +100293,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,10 +381,13 @@
+@@ -379,10 +380,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81732,7 +100307,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -391,6 +396,7 @@
+@@ -391,6 +395,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81740,7 +100315,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -552,6 +558,7 @@
+@@ -552,6 +557,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -81748,7 +100323,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -559,10 +566,12 @@
+@@ -559,10 +565,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -81761,7 +100336,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -596,7 +605,7 @@
+@@ -596,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81770,7 +100345,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +643,9 @@
+@@ -634,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81792,7 +100367,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81802,7 +100385,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -81810,7 +100393,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -81823,7 +100406,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81837,7 +100420,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81845,7 +100428,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -81853,7 +100436,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -81866,7 +100449,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -600,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -81875,7 +100458,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -638,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -81897,7 +100480,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -81907,7 +100498,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -81915,7 +100506,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -81928,7 +100519,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -81942,7 +100533,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -81950,7 +100541,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -81958,7 +100549,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -81971,7 +100562,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -81980,7 +100571,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82002,7 +100593,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -295,6 +296,9 @@
+@@ -245,7 +246,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82012,7 +100611,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,6 +349,7 @@
+@@ -345,6 +348,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -82020,7 +100619,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -352,12 +357,9 @@
+@@ -352,12 +356,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -82033,7 +100632,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,10 +380,13 @@
+@@ -378,10 +379,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82047,7 +100646,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -390,6 +395,7 @@
+@@ -390,6 +394,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82055,7 +100654,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -551,6 +557,7 @@
+@@ -551,6 +556,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -82063,7 +100662,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -558,10 +565,12 @@
+@@ -558,10 +564,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -82076,7 +100675,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -595,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82085,7 +100684,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -633,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82107,7 +100706,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -296,6 +297,9 @@
+@@ -246,7 +247,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82117,7 +100724,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,6 +350,7 @@
+@@ -346,6 +349,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -82125,7 +100732,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -353,12 +358,9 @@
+@@ -353,12 +357,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -82138,7 +100745,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,10 +381,13 @@
+@@ -379,10 +380,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82152,7 +100759,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -391,6 +396,7 @@
+@@ -391,6 +395,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82160,7 +100767,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -552,6 +558,7 @@
+@@ -552,6 +557,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -82168,7 +100775,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -559,10 +566,12 @@
+@@ -559,10 +565,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -82181,7 +100788,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -598,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82190,7 +100797,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -636,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82212,7 +100819,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82222,7 +100837,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -82230,7 +100845,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -82243,7 +100858,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82257,7 +100872,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82265,7 +100880,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -82273,7 +100888,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -82286,7 +100901,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -601,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82295,7 +100910,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -639,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82317,7 +100932,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82327,7 +100950,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -82335,7 +100958,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -82348,7 +100971,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82362,7 +100985,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82370,7 +100993,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -82378,7 +101001,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -82391,7 +101014,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82400,7 +101023,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82422,7 +101045,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -295,6 +296,9 @@
+@@ -245,7 +246,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82432,7 +101063,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,6 +349,7 @@
+@@ -345,6 +348,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -82440,7 +101071,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -352,12 +357,9 @@
+@@ -352,12 +356,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -82453,7 +101084,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,10 +380,13 @@
+@@ -378,10 +379,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82467,7 +101098,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -390,6 +395,7 @@
+@@ -390,6 +394,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82475,7 +101106,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -551,6 +557,7 @@
+@@ -551,6 +556,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -82483,7 +101114,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -558,10 +565,12 @@
+@@ -558,10 +564,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -82496,7 +101127,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -598,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -82505,7 +101136,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -636,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82527,7 +101158,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -328,6 +329,9 @@
+@@ -278,7 +279,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -328,6 +328,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82537,7 +101176,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -378,6 +382,7 @@
+@@ -378,6 +381,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -82545,7 +101184,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -385,12 +390,9 @@
+@@ -385,12 +389,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -82558,7 +101197,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -411,10 +413,13 @@
+@@ -411,10 +412,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82572,7 +101211,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -423,6 +428,7 @@
+@@ -423,6 +427,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82580,7 +101219,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -584,6 +590,7 @@
+@@ -584,6 +589,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -82588,7 +101227,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -591,10 +598,12 @@
+@@ -591,10 +597,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -82601,7 +101240,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -639,7 +648,7 @@
+@@ -639,7 +647,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82610,7 +101249,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -677,9 +686,9 @@
+@@ -677,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82622,6 +101261,40 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -1063,18 +1071,18 @@
+ extensionproxy_DEPENDENCIES = libkdeinit_extensionproxy.la
+ 
+ #>+ 3
+-appletproxy.moc: $(srcdir)/appletproxy.h
+-	$(MOC) $(srcdir)/appletproxy.h -o appletproxy.moc
++extensionproxy.moc: $(srcdir)/extensionproxy.h
++	$(MOC) $(srcdir)/extensionproxy.h -o extensionproxy.moc
+ 
+ #>+ 2
+-mocs: appletproxy.moc
++mocs: extensionproxy.moc
+ 
+ #>+ 3
+-extensionproxy.moc: $(srcdir)/extensionproxy.h
+-	$(MOC) $(srcdir)/extensionproxy.h -o extensionproxy.moc
++appletproxy.moc: $(srcdir)/appletproxy.h
++	$(MOC) $(srcdir)/appletproxy.h -o appletproxy.moc
+ 
+ #>+ 2
+-mocs: extensionproxy.moc
++mocs: appletproxy.moc
+ 
+ #>+ 3
+ extensiondebugger.moc: $(srcdir)/extensiondebugger.h
+@@ -1085,7 +1093,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  appletproxy.moc extensionproxy.moc extensiondebugger.moc
++	-rm -f  extensionproxy.moc appletproxy.moc extensiondebugger.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in appletproxy.h extensiondebugger.h extensionproxy.h Makefile.am 
 --- kicker/taskbar/Makefile.in
 +++ kicker/taskbar/Makefile.in
 @@ -156,6 +156,7 @@
@@ -82632,7 +101305,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82642,7 +101323,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -82650,7 +101331,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -82663,7 +101344,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82677,7 +101358,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82685,7 +101366,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -82693,7 +101374,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -82706,7 +101387,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -608,7 +617,7 @@
+@@ -608,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82715,7 +101396,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +655,9 @@
+@@ -646,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82737,7 +101418,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82747,7 +101436,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -82755,7 +101444,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -82768,7 +101457,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82782,7 +101471,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82790,7 +101479,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -82798,7 +101487,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -82811,7 +101500,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -597,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82820,7 +101509,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -635,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82832,45 +101521,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -912,22 +921,22 @@
- mocs: tasklmbmenu.moc
- 
- #>+ 3
--taskrmbmenu.moc: $(srcdir)/taskrmbmenu.h
--	$(MOC) $(srcdir)/taskrmbmenu.h -o taskrmbmenu.moc
-+taskmanager.moc: $(srcdir)/taskmanager.h
-+	$(MOC) $(srcdir)/taskmanager.h -o taskmanager.moc
- 
- #>+ 2
--mocs: taskrmbmenu.moc
-+mocs: taskmanager.moc
- 
- #>+ 3
--taskmanager.moc: $(srcdir)/taskmanager.h
--	$(MOC) $(srcdir)/taskmanager.h -o taskmanager.moc
-+taskrmbmenu.moc: $(srcdir)/taskrmbmenu.h
-+	$(MOC) $(srcdir)/taskrmbmenu.h -o taskrmbmenu.moc
- 
- #>+ 2
--mocs: taskmanager.moc
-+mocs: taskrmbmenu.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  tasklmbmenu.moc taskrmbmenu.moc taskmanager.moc
-+	-rm -f  tasklmbmenu.moc taskmanager.moc taskrmbmenu.moc
- 
- #>+ 2
- KDE_DIST=taskrmbmenu.h Makefile.in taskmanager.h configure.in.in tasklmbmenu.h Makefile.am 
-@@ -978,7 +987,7 @@
- 
- 
- #>+ 11
--libtaskmanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/tasklmbmenu.cpp $(srcdir)/taskrmbmenu.cpp $(srcdir)/taskmanager.cpp  tasklmbmenu.moc taskmanager.moc taskrmbmenu.moc
-+libtaskmanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/tasklmbmenu.cpp $(srcdir)/taskrmbmenu.cpp $(srcdir)/taskmanager.cpp  tasklmbmenu.moc taskrmbmenu.moc taskmanager.moc
- 	@echo 'creating libtaskmanager_la.all_cpp.cpp ...'; \
- 	rm -f libtaskmanager_la.all_cpp.files libtaskmanager_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libtaskmanager_la.all_cpp.final; \
 --- kioslave/about/Makefile.in
 +++ kioslave/about/Makefile.in
 @@ -153,6 +153,7 @@
@@ -82881,7 +101531,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82891,7 +101549,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -82899,7 +101557,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -82912,7 +101570,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -82926,7 +101584,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -82934,7 +101592,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -82942,7 +101600,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -82955,7 +101613,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -601,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -82964,7 +101622,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -639,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -82986,7 +101644,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -82996,7 +101662,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -83004,7 +101670,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -83017,7 +101683,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83031,7 +101697,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83039,7 +101705,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -83047,7 +101713,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -83060,7 +101726,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83069,7 +101735,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83091,7 +101757,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -311,6 +312,9 @@
+@@ -261,7 +262,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83101,7 +101775,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -361,6 +365,7 @@
+@@ -361,6 +364,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -83109,7 +101783,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -368,12 +373,9 @@
+@@ -368,12 +372,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -83122,7 +101796,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -394,10 +396,13 @@
+@@ -394,10 +395,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83136,7 +101810,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -406,6 +411,7 @@
+@@ -406,6 +410,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83144,7 +101818,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -567,6 +573,7 @@
+@@ -567,6 +572,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -83152,7 +101826,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -574,10 +581,12 @@
+@@ -574,10 +580,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -83165,7 +101839,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -613,7 +622,7 @@
+@@ -613,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83174,7 +101848,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +660,9 @@
+@@ -651,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83196,7 +101870,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83206,7 +101888,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -83214,7 +101896,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -83227,7 +101909,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83241,7 +101923,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83249,7 +101931,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -83257,7 +101939,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -83270,7 +101952,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -600,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -83279,7 +101961,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -638,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83301,7 +101983,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83311,7 +102001,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -83319,7 +102009,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -83332,7 +102022,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83346,7 +102036,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83354,7 +102044,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -83362,7 +102052,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -83375,7 +102065,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83384,7 +102074,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83406,7 +102096,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83416,7 +102114,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -83424,7 +102122,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -83437,7 +102135,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83451,7 +102149,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83459,7 +102157,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -83467,7 +102165,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -83480,7 +102178,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -601,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83489,7 +102187,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -639,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83511,7 +102209,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -298,6 +299,9 @@
+@@ -248,7 +249,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83521,7 +102227,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,6 +352,7 @@
+@@ -348,6 +351,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -83529,7 +102235,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -355,12 +360,9 @@
+@@ -355,12 +359,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -83542,7 +102248,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -381,10 +383,13 @@
+@@ -381,10 +382,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83556,7 +102262,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -393,6 +398,7 @@
+@@ -393,6 +397,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83564,7 +102270,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -554,6 +560,7 @@
+@@ -554,6 +559,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -83572,7 +102278,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -561,10 +568,12 @@
+@@ -561,10 +567,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -83585,7 +102291,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -601,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83594,7 +102300,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -639,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83616,7 +102322,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83626,7 +102340,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -83634,7 +102348,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -83647,7 +102361,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83661,7 +102375,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83669,7 +102383,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -83677,7 +102391,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -83690,7 +102404,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -601,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83699,7 +102413,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -639,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83721,7 +102435,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -324,6 +325,9 @@
+@@ -274,7 +275,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83731,7 +102453,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -374,6 +378,7 @@
+@@ -374,6 +377,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -83739,7 +102461,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -381,12 +386,9 @@
+@@ -381,12 +385,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -83752,7 +102474,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,10 +409,13 @@
+@@ -407,10 +408,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83766,7 +102488,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -419,6 +424,7 @@
+@@ -419,6 +423,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83774,7 +102496,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -580,6 +586,7 @@
+@@ -580,6 +585,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -83782,7 +102504,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -587,10 +594,12 @@
+@@ -587,10 +593,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -83795,7 +102517,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -632,7 +641,7 @@
+@@ -632,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -83804,7 +102526,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -670,9 +679,9 @@
+@@ -670,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83826,7 +102548,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83836,7 +102566,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -83844,7 +102574,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -83857,7 +102587,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83871,7 +102601,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83879,7 +102609,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -83887,7 +102617,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -83900,7 +102630,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -608,7 +617,7 @@
+@@ -608,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -83909,7 +102639,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +655,9 @@
+@@ -646,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -83931,7 +102661,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -298,6 +299,9 @@
+@@ -248,7 +249,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -83941,7 +102679,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,6 +352,7 @@
+@@ -348,6 +351,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -83949,7 +102687,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -355,12 +360,9 @@
+@@ -355,12 +359,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -83962,7 +102700,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -381,10 +383,13 @@
+@@ -381,10 +382,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -83976,7 +102714,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -393,6 +398,7 @@
+@@ -393,6 +397,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -83984,7 +102722,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -554,6 +560,7 @@
+@@ -554,6 +559,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -83992,7 +102730,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -561,10 +568,12 @@
+@@ -561,10 +567,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -84005,7 +102743,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -603,7 +612,7 @@
+@@ -603,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -84014,7 +102752,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +650,9 @@
+@@ -641,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84036,7 +102774,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -296,6 +297,9 @@
+@@ -246,7 +247,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84046,7 +102792,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,6 +350,7 @@
+@@ -346,6 +349,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -84054,7 +102800,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -353,12 +358,9 @@
+@@ -353,12 +357,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -84067,7 +102813,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,10 +381,13 @@
+@@ -379,10 +380,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84081,7 +102827,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -391,6 +396,7 @@
+@@ -391,6 +395,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84089,7 +102835,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -552,6 +558,7 @@
+@@ -552,6 +557,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -84097,7 +102843,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -559,10 +566,12 @@
+@@ -559,10 +565,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -84110,7 +102856,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -601,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -84119,7 +102865,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -639,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84131,7 +102877,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -955,14 +964,14 @@
+@@ -955,14 +963,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -84159,7 +102905,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -269,6 +270,9 @@
+@@ -219,7 +220,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -269,6 +269,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84169,7 +102923,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -319,6 +323,7 @@
+@@ -319,6 +322,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -84177,7 +102931,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -326,12 +331,9 @@
+@@ -326,12 +330,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -84190,7 +102944,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -352,10 +354,13 @@
+@@ -352,10 +353,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84204,7 +102958,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -364,6 +369,7 @@
+@@ -364,6 +368,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84212,7 +102966,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -525,6 +531,7 @@
+@@ -525,6 +530,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -84220,7 +102974,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -532,10 +539,12 @@
+@@ -532,10 +538,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -84233,7 +102987,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -566,7 +575,7 @@
+@@ -566,7 +574,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -84242,7 +102996,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -604,9 +613,9 @@
+@@ -604,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84264,7 +103018,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -321,6 +322,9 @@
+@@ -271,7 +272,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -321,6 +321,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84274,7 +103036,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -371,6 +375,7 @@
+@@ -371,6 +374,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -84282,7 +103044,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -378,12 +383,9 @@
+@@ -378,12 +382,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -84295,7 +103057,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -404,10 +406,13 @@
+@@ -404,10 +405,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84309,7 +103071,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -416,6 +421,7 @@
+@@ -416,6 +420,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84317,7 +103079,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -577,6 +583,7 @@
+@@ -577,6 +582,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -84325,7 +103087,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -584,10 +591,12 @@
+@@ -584,10 +590,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -84338,7 +103100,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -640,7 +649,7 @@
+@@ -640,7 +648,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -84347,7 +103109,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -678,9 +687,9 @@
+@@ -678,9 +686,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84369,7 +103131,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -303,6 +304,9 @@
+@@ -253,7 +254,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84379,7 +103149,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -84387,7 +103157,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -360,12 +365,9 @@
+@@ -360,12 +364,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -84400,7 +103170,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -386,10 +388,13 @@
+@@ -386,10 +387,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84414,7 +103184,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -398,6 +403,7 @@
+@@ -398,6 +402,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84422,7 +103192,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -559,6 +565,7 @@
+@@ -559,6 +564,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -84430,7 +103200,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -566,10 +573,12 @@
+@@ -566,10 +572,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -84443,7 +103213,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -617,7 +626,7 @@
+@@ -617,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -84452,7 +103222,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +664,9 @@
+@@ -655,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84464,49 +103234,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -950,18 +959,18 @@
- 
- 
- #>+ 3
--serviceconfigdialog.moc: $(srcdir)/serviceconfigdialog.h
--	$(MOC) $(srcdir)/serviceconfigdialog.h -o serviceconfigdialog.moc
-+managermodule.moc: $(srcdir)/managermodule.h
-+	$(MOC) $(srcdir)/managermodule.h -o managermodule.moc
- 
- #>+ 2
--mocs: serviceconfigdialog.moc
-+mocs: managermodule.moc
- 
- #>+ 3
--managermodule.moc: $(srcdir)/managermodule.h
--	$(MOC) $(srcdir)/managermodule.h -o managermodule.moc
-+serviceconfigdialog.moc: $(srcdir)/serviceconfigdialog.h
-+	$(MOC) $(srcdir)/serviceconfigdialog.h -o serviceconfigdialog.moc
- 
- #>+ 2
--mocs: managermodule.moc
-+mocs: serviceconfigdialog.moc
- 
- #>+ 3
- notifiermodule.moc: $(srcdir)/notifiermodule.h
-@@ -979,7 +988,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  serviceconfigdialog.moc managermodule.moc notifiermodule.moc main.moc
-+	-rm -f  managermodule.moc serviceconfigdialog.moc notifiermodule.moc main.moc
- 
- #>+ 2
- KDE_DIST=serviceview.ui notifiermoduleview.ui Makefile.in managermoduleview.ui media.desktop Makefile.am 
-@@ -1037,7 +1046,7 @@
- 
- 
- #>+ 11
--kcm_media_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/notifiermodule.cpp $(srcdir)/serviceconfigdialog.cpp $(srcdir)/mimetypelistboxitem.cpp $(srcdir)/managermodule.cpp $(srcdir)/main.cpp notifiermoduleview.cpp serviceview.cpp managermoduleview.cpp  managermoduleview.moc managermodule.moc serviceconfigdialog.moc serviceview.moc notifiermoduleview.moc main.moc notifiermodule.moc
-+kcm_media_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/notifiermodule.cpp $(srcdir)/serviceconfigdialog.cpp $(srcdir)/mimetypelistboxitem.cpp $(srcdir)/managermodule.cpp $(srcdir)/main.cpp notifiermoduleview.cpp serviceview.cpp managermoduleview.cpp  managermoduleview.moc serviceconfigdialog.moc managermodule.moc serviceview.moc notifiermoduleview.moc main.moc notifiermodule.moc
- 	@echo 'creating kcm_media_la.all_cpp.cpp ...'; \
- 	rm -f kcm_media_la.all_cpp.files kcm_media_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_media_la.all_cpp.final; \
 --- kioslave/media/kfile-plugin/Makefile.in
 +++ kioslave/media/kfile-plugin/Makefile.in
 @@ -154,6 +154,7 @@
@@ -84517,7 +103244,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -298,6 +299,9 @@
+@@ -248,7 +249,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84527,7 +103262,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -348,6 +352,7 @@
+@@ -348,6 +351,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -84535,7 +103270,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -355,12 +360,9 @@
+@@ -355,12 +359,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -84548,7 +103283,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -381,10 +383,13 @@
+@@ -381,10 +382,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84562,7 +103297,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -393,6 +398,7 @@
+@@ -393,6 +397,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84570,7 +103305,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -554,6 +560,7 @@
+@@ -554,6 +559,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -84578,7 +103313,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -561,10 +568,12 @@
+@@ -561,10 +567,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -84591,7 +103326,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -84600,7 +103335,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84622,7 +103357,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84632,7 +103375,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -84640,7 +103383,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -84653,7 +103396,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84667,7 +103410,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84675,7 +103418,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -84683,7 +103426,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -84696,7 +103439,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -606,7 +615,7 @@
+@@ -606,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -84705,7 +103448,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +653,9 @@
+@@ -644,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84727,7 +103470,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -325,6 +326,9 @@
+@@ -275,7 +276,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -325,6 +325,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84737,7 +103488,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,6 +379,7 @@
+@@ -375,6 +378,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -84745,7 +103496,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -382,12 +387,9 @@
+@@ -382,12 +386,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -84758,7 +103509,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,10 +410,13 @@
+@@ -408,10 +409,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84772,7 +103523,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -420,6 +425,7 @@
+@@ -420,6 +424,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84780,7 +103531,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -581,6 +587,7 @@
+@@ -581,6 +586,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -84788,7 +103539,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -588,10 +595,12 @@
+@@ -588,10 +594,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -84801,7 +103552,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -636,7 +645,7 @@
+@@ -636,7 +644,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -84810,7 +103561,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -674,9 +683,9 @@
+@@ -674,9 +682,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84832,7 +103583,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -334,6 +335,9 @@
+@@ -284,7 +285,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -334,6 +334,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84842,7 +103601,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -384,6 +388,7 @@
+@@ -384,6 +387,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -84850,7 +103609,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -391,12 +396,9 @@
+@@ -391,12 +395,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -84863,7 +103622,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -417,10 +419,13 @@
+@@ -417,10 +418,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84877,7 +103636,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -429,6 +434,7 @@
+@@ -429,6 +433,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84885,7 +103644,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -590,6 +596,7 @@
+@@ -590,6 +595,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -84893,7 +103652,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -597,10 +604,12 @@
+@@ -597,10 +603,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -84906,7 +103665,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -645,7 +654,7 @@
+@@ -645,7 +653,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -84915,7 +103674,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -683,9 +692,9 @@
+@@ -683,9 +691,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -84927,6 +103686,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+@@ -1035,7 +1043,7 @@
+ 	-rm -f  removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
+ 
+ #>+ 2
+-KDE_DIST=fstabbackend.h mediadirnotify.h linuxcdpolling.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am 
++KDE_DIST=fstabbackend.h linuxcdpolling.h mediadirnotify.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am 
+ 
+ #>+ 5
+ clean-idl:
 --- kioslave/media/medianotifier/Makefile.in
 +++ kioslave/media/medianotifier/Makefile.in
 @@ -160,6 +160,7 @@
@@ -84937,7 +103705,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -304,6 +305,9 @@
+@@ -254,7 +255,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -304,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -84947,7 +103723,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -354,6 +358,7 @@
+@@ -354,6 +357,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -84955,7 +103731,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -361,12 +366,9 @@
+@@ -361,12 +365,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -84968,7 +103744,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -387,10 +389,13 @@
+@@ -387,10 +388,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -84982,7 +103758,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -399,6 +404,7 @@
+@@ -399,6 +403,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -84990,7 +103766,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -560,6 +566,7 @@
+@@ -560,6 +565,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -84998,7 +103774,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -567,10 +574,12 @@
+@@ -567,10 +573,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -85011,7 +103787,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -612,7 +621,7 @@
+@@ -612,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85020,7 +103796,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +659,9 @@
+@@ -650,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85042,7 +103818,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85052,7 +103836,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -85060,7 +103844,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -85073,7 +103857,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85087,7 +103871,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85095,7 +103879,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -85103,7 +103887,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -85116,7 +103900,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -572,7 +580,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -85125,7 +103909,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -610,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85147,7 +103931,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -286,6 +287,9 @@
+@@ -236,7 +237,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85157,7 +103949,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,6 +340,7 @@
+@@ -336,6 +339,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -85165,7 +103957,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -343,12 +348,9 @@
+@@ -343,12 +347,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -85178,7 +103970,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,10 +371,13 @@
+@@ -369,10 +370,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85192,7 +103984,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -381,6 +386,7 @@
+@@ -381,6 +385,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85200,7 +103992,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -542,6 +548,7 @@
+@@ -542,6 +547,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -85208,7 +104000,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -549,10 +556,12 @@
+@@ -549,10 +555,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -85221,7 +104013,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -584,7 +593,7 @@
+@@ -584,7 +592,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85230,7 +104022,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +631,9 @@
+@@ -622,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85252,7 +104044,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85262,7 +104062,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -85270,7 +104070,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -85283,7 +104083,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85297,7 +104097,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85305,7 +104105,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -85313,7 +104113,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -85326,7 +104126,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -85335,7 +104135,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85357,7 +104157,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -308,6 +309,9 @@
+@@ -258,7 +259,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -308,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85367,7 +104175,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -358,6 +362,7 @@
+@@ -358,6 +361,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -85375,7 +104183,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -365,12 +370,9 @@
+@@ -365,12 +369,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -85388,7 +104196,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -391,10 +393,13 @@
+@@ -391,10 +392,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85402,7 +104210,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -403,6 +408,7 @@
+@@ -403,6 +407,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85410,7 +104218,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -564,6 +570,7 @@
+@@ -564,6 +569,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -85418,7 +104226,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -571,10 +578,12 @@
+@@ -571,10 +577,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -85431,7 +104239,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -612,7 +621,7 @@
+@@ -612,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -85440,7 +104248,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +659,9 @@
+@@ -650,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85462,7 +104270,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85472,7 +104288,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -85480,7 +104296,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -85493,7 +104309,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85507,7 +104323,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85515,7 +104331,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -85523,7 +104339,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -85536,7 +104352,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -600,7 +609,7 @@
+@@ -600,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85545,7 +104361,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +647,9 @@
+@@ -638,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85567,7 +104383,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85577,7 +104401,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -85585,7 +104409,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -85598,7 +104422,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85612,7 +104436,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85620,7 +104444,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -85628,7 +104452,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -85641,7 +104465,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -85650,7 +104474,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85672,7 +104496,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85682,7 +104514,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -85690,7 +104522,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -85703,7 +104535,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85717,7 +104549,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85725,7 +104557,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -85733,7 +104565,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -85746,7 +104578,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -602,7 +611,7 @@
+@@ -602,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85755,7 +104587,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +649,9 @@
+@@ -640,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85777,7 +104609,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -324,6 +325,9 @@
+@@ -274,7 +275,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85787,7 +104627,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -374,6 +378,7 @@
+@@ -374,6 +377,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -85795,7 +104635,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -381,12 +386,9 @@
+@@ -381,12 +385,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -85808,7 +104648,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,10 +409,13 @@
+@@ -407,10 +408,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85822,7 +104662,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -419,6 +424,7 @@
+@@ -419,6 +423,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85830,7 +104670,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -580,6 +586,7 @@
+@@ -580,6 +585,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -85838,7 +104678,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -587,10 +594,12 @@
+@@ -587,10 +593,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -85851,7 +104691,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -632,7 +641,7 @@
+@@ -632,7 +640,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -85860,7 +104700,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -670,9 +679,9 @@
+@@ -670,9 +678,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85882,7 +104722,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -311,6 +312,9 @@
+@@ -261,7 +262,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85892,7 +104740,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -361,6 +365,7 @@
+@@ -361,6 +364,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -85900,7 +104748,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -368,12 +373,9 @@
+@@ -368,12 +372,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -85913,7 +104761,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -394,10 +396,13 @@
+@@ -394,10 +395,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -85927,7 +104775,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -406,6 +411,7 @@
+@@ -406,6 +410,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -85935,7 +104783,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -567,6 +573,7 @@
+@@ -567,6 +572,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -85943,7 +104791,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -574,10 +581,12 @@
+@@ -574,10 +580,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -85956,7 +104804,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -614,7 +623,7 @@
+@@ -614,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -85965,7 +104813,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +661,9 @@
+@@ -652,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -85987,7 +104835,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -309,6 +310,9 @@
+@@ -259,7 +260,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -85997,7 +104853,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -359,6 +363,7 @@
+@@ -359,6 +362,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -86005,7 +104861,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -366,12 +371,9 @@
+@@ -366,12 +370,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -86018,7 +104874,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,10 +394,13 @@
+@@ -392,10 +393,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86032,7 +104888,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -404,6 +409,7 @@
+@@ -404,6 +408,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86040,7 +104896,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -565,6 +571,7 @@
+@@ -565,6 +570,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -86048,7 +104904,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -572,10 +579,12 @@
+@@ -572,10 +578,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -86061,7 +104917,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -613,7 +622,7 @@
+@@ -613,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -86070,7 +104926,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +660,9 @@
+@@ -651,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86092,7 +104948,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -308,6 +309,9 @@
+@@ -258,7 +259,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -308,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86102,7 +104966,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -358,6 +362,7 @@
+@@ -358,6 +361,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -86110,7 +104974,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -365,12 +370,9 @@
+@@ -365,12 +369,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -86123,7 +104987,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -391,10 +393,13 @@
+@@ -391,10 +392,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86137,7 +105001,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -403,6 +408,7 @@
+@@ -403,6 +407,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86145,7 +105009,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -564,6 +570,7 @@
+@@ -564,6 +569,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -86153,7 +105017,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -571,10 +578,12 @@
+@@ -571,10 +577,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -86166,7 +105030,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -625,7 +634,7 @@
+@@ -625,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -86175,7 +105039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +672,9 @@
+@@ -663,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86197,7 +105061,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -330,6 +331,9 @@
+@@ -280,7 +281,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -330,6 +330,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86207,7 +105079,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -380,6 +384,7 @@
+@@ -380,6 +383,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -86215,7 +105087,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -387,12 +392,9 @@
+@@ -387,12 +391,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -86228,7 +105100,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -413,10 +415,13 @@
+@@ -413,10 +414,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86242,7 +105114,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -425,6 +430,7 @@
+@@ -425,6 +429,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86250,7 +105122,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -586,6 +592,7 @@
+@@ -586,6 +591,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -86258,7 +105130,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -593,10 +600,12 @@
+@@ -593,10 +599,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -86271,7 +105143,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -644,7 +653,7 @@
+@@ -644,7 +652,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -86280,7 +105152,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -682,9 +691,9 @@
+@@ -682,9 +690,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86302,7 +105174,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -264,6 +265,9 @@
+@@ -214,7 +215,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -264,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86312,7 +105192,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -314,6 +318,7 @@
+@@ -314,6 +317,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -86320,7 +105200,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -321,12 +326,9 @@
+@@ -321,12 +325,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -86333,7 +105213,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -347,10 +349,13 @@
+@@ -347,10 +348,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86347,7 +105227,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -359,6 +364,7 @@
+@@ -359,6 +363,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86355,7 +105235,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -520,6 +526,7 @@
+@@ -520,6 +525,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -86363,7 +105243,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -527,10 +534,12 @@
+@@ -527,10 +533,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -86376,7 +105256,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -86385,7 +105265,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86407,7 +105287,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86417,7 +105305,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -86425,7 +105313,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -86438,7 +105326,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86452,7 +105340,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86460,7 +105348,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -86468,7 +105356,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -86481,7 +105369,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -602,7 +611,7 @@
+@@ -602,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -86490,7 +105378,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +649,9 @@
+@@ -640,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86512,7 +105400,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -324,6 +325,9 @@
+@@ -274,7 +275,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86522,7 +105418,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -374,6 +378,7 @@
+@@ -374,6 +377,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -86530,7 +105426,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -381,12 +386,9 @@
+@@ -381,12 +385,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -86543,7 +105439,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -407,10 +409,13 @@
+@@ -407,10 +408,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86557,7 +105453,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -419,6 +424,7 @@
+@@ -419,6 +423,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86565,7 +105461,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -580,6 +586,7 @@
+@@ -580,6 +585,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -86573,7 +105469,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -587,10 +594,12 @@
+@@ -587,10 +593,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -86586,7 +105482,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -631,7 +640,7 @@
+@@ -631,7 +639,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -86595,7 +105491,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -669,9 +678,9 @@
+@@ -669,9 +677,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86617,7 +105513,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86627,7 +105531,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -86635,7 +105539,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -86648,7 +105552,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86662,7 +105566,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86670,7 +105574,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -86678,7 +105582,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -86691,7 +105595,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -86700,7 +105604,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86722,7 +105626,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -303,6 +304,9 @@
+@@ -253,7 +254,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86732,7 +105644,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -86740,7 +105652,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -360,12 +365,9 @@
+@@ -360,12 +364,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -86753,7 +105665,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -386,10 +388,13 @@
+@@ -386,10 +387,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86767,7 +105679,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -398,6 +403,7 @@
+@@ -398,6 +402,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86775,7 +105687,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -559,6 +565,7 @@
+@@ -559,6 +564,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -86783,7 +105695,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -566,10 +573,12 @@
+@@ -566,10 +572,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -86796,7 +105708,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -607,7 +616,7 @@
+@@ -607,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -86805,7 +105717,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +654,9 @@
+@@ -645,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86827,7 +105739,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -342,6 +343,9 @@
+@@ -292,7 +293,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -342,6 +342,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86837,7 +105757,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -392,6 +396,7 @@
+@@ -392,6 +395,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -86845,7 +105765,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -399,12 +404,9 @@
+@@ -399,12 +403,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -86858,7 +105778,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -425,10 +427,13 @@
+@@ -425,10 +426,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86872,7 +105792,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -437,6 +442,7 @@
+@@ -437,6 +441,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86880,7 +105800,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -598,6 +604,7 @@
+@@ -598,6 +603,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -86888,7 +105808,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -605,10 +612,12 @@
+@@ -605,10 +611,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -86901,7 +105821,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -681,7 +690,7 @@
+@@ -681,7 +689,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -86910,7 +105830,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -719,9 +728,9 @@
+@@ -719,9 +727,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -86932,7 +105852,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -295,6 +296,9 @@
+@@ -245,7 +246,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -86942,7 +105870,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,6 +349,7 @@
+@@ -345,6 +348,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -86950,7 +105878,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -352,12 +357,9 @@
+@@ -352,12 +356,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -86963,7 +105891,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,10 +380,13 @@
+@@ -378,10 +379,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -86977,7 +105905,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -390,6 +395,7 @@
+@@ -390,6 +394,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -86985,7 +105913,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -551,6 +557,7 @@
+@@ -551,6 +556,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -86993,7 +105921,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -558,10 +565,12 @@
+@@ -558,10 +564,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -87006,7 +105934,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -595,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -87015,7 +105943,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -633,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87037,7 +105965,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -330,6 +331,9 @@
+@@ -280,7 +281,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -330,6 +330,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87047,7 +105983,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -380,6 +384,7 @@
+@@ -380,6 +383,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -87055,7 +105991,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -387,12 +392,9 @@
+@@ -387,12 +391,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -87068,7 +106004,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -413,10 +415,13 @@
+@@ -413,10 +414,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -87082,7 +106018,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -425,6 +430,7 @@
+@@ -425,6 +429,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -87090,7 +106026,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -586,6 +592,7 @@
+@@ -586,6 +591,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -87098,7 +106034,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -593,10 +600,12 @@
+@@ -593,10 +599,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -87111,7 +106047,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -641,7 +650,7 @@
+@@ -641,7 +649,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -87120,7 +106056,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -679,9 +688,9 @@
+@@ -679,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87142,7 +106078,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -348,6 +349,9 @@
+@@ -298,7 +299,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -348,6 +348,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87152,7 +106096,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -398,6 +402,7 @@
+@@ -398,6 +401,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -87160,7 +106104,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -405,12 +410,9 @@
+@@ -405,12 +409,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -87173,7 +106117,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -431,10 +433,13 @@
+@@ -431,10 +432,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -87187,7 +106131,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -443,6 +448,7 @@
+@@ -443,6 +447,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -87195,7 +106139,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -604,6 +610,7 @@
+@@ -604,6 +609,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -87203,7 +106147,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -611,10 +618,12 @@
+@@ -611,10 +617,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -87216,7 +106160,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -680,7 +689,7 @@
+@@ -680,7 +688,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -87225,7 +106169,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -718,9 +727,9 @@
+@@ -718,9 +726,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87237,132 +106181,88 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1255,6 +1264,13 @@
+@@ -1255,18 +1263,18 @@
  mocs: history.moc
  
  #>+ 3
+-urlgrabber.moc: $(srcdir)/urlgrabber.h
+-	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
 +configdialog.moc: $(srcdir)/configdialog.h
 +	$(MOC) $(srcdir)/configdialog.h -o configdialog.moc
-+
-+#>+ 2
+ 
+ #>+ 2
+-mocs: urlgrabber.moc
 +mocs: configdialog.moc
-+
-+#>+ 3
- urlgrabber.moc: $(srcdir)/urlgrabber.h
- 	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
  
-@@ -1262,18 +1278,18 @@
- mocs: urlgrabber.moc
- 
  #>+ 3
 -configdialog.moc: $(srcdir)/configdialog.h
 -	$(MOC) $(srcdir)/configdialog.h -o configdialog.moc
-+toplevel.moc: $(srcdir)/toplevel.h
-+	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++urlgrabber.moc: $(srcdir)/urlgrabber.h
++	$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
  
  #>+ 2
 -mocs: configdialog.moc
-+mocs: toplevel.moc
++mocs: urlgrabber.moc
  
  #>+ 3
--clipboardpoll.moc: $(srcdir)/clipboardpoll.h
--	$(MOC) $(srcdir)/clipboardpoll.h -o clipboardpoll.moc
-+popupproxy.moc: $(srcdir)/popupproxy.h
-+	$(MOC) $(srcdir)/popupproxy.h -o popupproxy.moc
+ clipboardpoll.moc: $(srcdir)/clipboardpoll.h
+@@ -1305,7 +1313,7 @@
  
- #>+ 2
--mocs: clipboardpoll.moc
-+mocs: popupproxy.moc
- 
  #>+ 3
- klipperpopup.moc: $(srcdir)/klipperpopup.h
-@@ -1283,18 +1299,11 @@
- mocs: klipperpopup.moc
- 
- #>+ 3
--toplevel.moc: $(srcdir)/toplevel.h
--	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
--
--#>+ 2
--mocs: toplevel.moc
--
--#>+ 3
--popupproxy.moc: $(srcdir)/popupproxy.h
--	$(MOC) $(srcdir)/popupproxy.h -o popupproxy.moc
-+clipboardpoll.moc: $(srcdir)/clipboardpoll.h
-+	$(MOC) $(srcdir)/clipboardpoll.h -o clipboardpoll.moc
- 
- #>+ 2
--mocs: popupproxy.moc
-+mocs: clipboardpoll.moc
- 
- #>+ 3
- applet.moc: $(srcdir)/applet.h
-@@ -1305,7 +1314,7 @@
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  history.moc urlgrabber.moc configdialog.moc clipboardpoll.moc klipperpopup.moc toplevel.moc popupproxy.moc applet.moc
-+	-rm -f  history.moc configdialog.moc urlgrabber.moc toplevel.moc popupproxy.moc klipperpopup.moc clipboardpoll.moc applet.moc
++	-rm -f  history.moc configdialog.moc urlgrabber.moc clipboardpoll.moc klipperpopup.moc toplevel.moc popupproxy.moc applet.moc
  
  #>+ 2
  KDE_DIST=popupproxy.h klipperbindings.cpp historyurlitem.h Makefile.in hisc-app-klipper.svgz historystringitem.h hi32-app-klipper.png urlgrabber.h klipperrc.upd configure.in.in configdialog.h klipper-1-2.pl history.h klippershortcuts.upd applet.h toplevel.h hi128-app-klipper.png hi48-app-klipper.png klipperrc.desktop klipperpopup.h klipper.desktop hi22-app-klipper.png hi16-app-klipper.png clipboardpoll.h klipper-kde31.sh historyitem.h hi64-app-klipper.png historyimageitem.h version.h Makefile.am 
-@@ -1321,29 +1330,29 @@
+@@ -1321,29 +1329,29 @@
  
  #>+ 25
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/hisc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/klipper.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 +	$(INSTALL_DATA) $(srcdir)/hisc-app-klipper.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/klipper.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
  	$(INSTALL_DATA) $(srcdir)/hi64-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/klipper.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/hi48-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/hi32-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/klipper.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 +	$(INSTALL_DATA) $(srcdir)/hi48-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-klipper.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/klipper.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/klipper.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/klipper.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/klipper.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/klipper.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/klipper.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/klipper.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/klipper.png
  
  #>+ 15
  force-reedit:
-@@ -1396,7 +1405,7 @@
+@@ -1396,7 +1404,7 @@
  	rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
  
  #>+ 11
 -libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp $(srcdir)/historyurlitem.cpp toplevel_skel.cpp  history.moc configdialog.moc urlgrabber.moc toplevel.moc popupproxy.moc klipperpopup.moc clipboardpoll.moc
-+libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp $(srcdir)/historyurlitem.cpp toplevel_skel.cpp  history.moc urlgrabber.moc configdialog.moc toplevel.moc clipboardpoll.moc klipperpopup.moc popupproxy.moc
++libklipper_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/clipboardpoll.cpp $(srcdir)/history.cpp $(srcdir)/historyitem.cpp $(srcdir)/historystringitem.cpp $(srcdir)/klipperpopup.cpp $(srcdir)/popupproxy.cpp $(srcdir)/historyimageitem.cpp $(srcdir)/historyurlitem.cpp toplevel_skel.cpp  history.moc urlgrabber.moc configdialog.moc toplevel.moc popupproxy.moc klipperpopup.moc clipboardpoll.moc
  	@echo 'creating libklipper_common_la.all_cpp.cpp ...'; \
  	rm -f libklipper_common_la.all_cpp.files libklipper_common_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libklipper_common_la.all_cpp.final; \
-@@ -1460,6 +1469,6 @@
- history.lo: history.moc 
- configdialog.lo: configdialog.moc 
- applet.o: applet.moc 
--clipboardpoll.o: clipboardpoll.moc 
- klipperpopup.lo: klipperpopup.moc 
-+clipboardpoll.o: clipboardpoll.moc 
- popupproxy.lo: popupproxy.moc 
 --- kmenuedit/Makefile.in
 +++ kmenuedit/Makefile.in
 @@ -211,6 +211,7 @@
@@ -87373,7 +106273,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -355,6 +356,9 @@
+@@ -305,7 +306,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -355,6 +355,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87383,7 +106291,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,6 +409,7 @@
+@@ -405,6 +408,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -87391,7 +106299,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -412,12 +417,9 @@
+@@ -412,12 +416,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -87404,7 +106312,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -438,10 +440,13 @@
+@@ -438,10 +439,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -87418,7 +106326,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -450,6 +455,7 @@
+@@ -450,6 +454,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -87426,7 +106334,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -611,6 +617,7 @@
+@@ -611,6 +616,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -87434,7 +106342,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -618,10 +625,12 @@
+@@ -618,10 +624,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -87447,7 +106355,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -681,7 +690,7 @@
+@@ -681,7 +689,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -87456,7 +106364,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -719,9 +728,9 @@
+@@ -719,9 +727,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87468,70 +106376,33 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1282,18 +1291,18 @@
- kcontroledit_DEPENDENCIES = libkdeinit_kcontroledit.la
+@@ -1314,20 +1322,20 @@
  
- #>+ 3
--basictab.moc: $(srcdir)/basictab.h
--	$(MOC) $(srcdir)/basictab.h -o basictab.moc
-+treeview.moc: $(srcdir)/treeview.h
-+	$(MOC) $(srcdir)/treeview.h -o treeview.moc
- 
- #>+ 2
--mocs: basictab.moc
-+mocs: treeview.moc
- 
- #>+ 3
--treeview.moc: $(srcdir)/treeview.h
--	$(MOC) $(srcdir)/treeview.h -o treeview.moc
-+basictab.moc: $(srcdir)/basictab.h
-+	$(MOC) $(srcdir)/basictab.h -o basictab.moc
- 
- #>+ 2
--mocs: treeview.moc
-+mocs: basictab.moc
- 
- #>+ 3
- kmenuedit.moc: $(srcdir)/kmenuedit.h
-@@ -1304,7 +1313,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  basictab.moc treeview.moc kmenuedit.moc
-+	-rm -f  treeview.moc basictab.moc kmenuedit.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in uninstall.desktop kmenuedit.desktop hi32-app-kmenuedit.png hi22-app-kmenuedit.png kmenueditui.rc hi48-app-kmenuedit.png kcontroleditui.rc hi16-app-kmenuedit.png Makefile.am 
-@@ -1316,17 +1325,17 @@
+ #>+ 16
  install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/hi32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmenuedit.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmenuedit.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 +	$(INSTALL_DATA) $(srcdir)/hi32-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kmenuedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmenuedit.png
  
  uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmenuedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmenuedit.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmenuedit.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmenuedit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmenuedit.png
  
  #>+ 15
-@@ -1368,7 +1377,7 @@
- 
- 
- #>+ 11
--libkmenueditcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/khotkeys.cpp $(srcdir)/menufile.cpp $(srcdir)/menuinfo.cpp  treeview.moc basictab.moc kmenuedit.moc
-+libkmenueditcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/khotkeys.cpp $(srcdir)/menufile.cpp $(srcdir)/menuinfo.cpp  basictab.moc treeview.moc kmenuedit.moc
- 	@echo 'creating libkmenueditcommon_la.all_cpp.cpp ...'; \
- 	rm -f libkmenueditcommon_la.all_cpp.files libkmenueditcommon_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkmenueditcommon_la.all_cpp.final; \
+ force-reedit:
 --- kmenuedit/pixmaps/Makefile.in
 +++ kmenuedit/pixmaps/Makefile.in
 @@ -107,6 +107,7 @@
@@ -87542,7 +106413,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87552,7 +106431,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -87560,7 +106439,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -87573,7 +106452,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -87587,7 +106466,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -87595,7 +106474,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -87603,7 +106482,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -87616,7 +106495,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -546,7 +555,7 @@
+@@ -546,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -87625,7 +106504,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -584,9 +593,9 @@
+@@ -584,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87637,51 +106516,54 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -737,33 +746,33 @@
+@@ -736,34 +744,34 @@
+ 
  #>+ 30
  install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
++	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
  	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.png
 -	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
- 	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
-+	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+-	$(mkinstalldirs) $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
++	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
  	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
  	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.png
 -	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
- 	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
-+	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+-	$(mkinstalldirs) $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/lo16-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-menu_new_sep.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-menu_new.png $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
++	-rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
++	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
  	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new.png
--	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
+ 	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
 -	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
- 	-rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
+-	-rm -f $(DESTDIR)$(kmenuediticondir)/locolor/16x16/actions/menu_new.png
 -	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-+	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
 +	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-+	-rm -f $(DESTDIR)$(kmenuediticondir)/crystalsvg/32x32/actions/menu_new.png
++	-rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
++	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
  	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new.png
--	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
+ 	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
 -	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
- 	-rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
-+	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new_sep.png
+-	-rm -f $(DESTDIR)$(kcontrolediticondir)/locolor/16x16/actions/menu_new.png
 +	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/22x22/actions/menu_new_sep.png
-+	-rm -f $(DESTDIR)$(kcontrolediticondir)/crystalsvg/32x32/actions/menu_new.png
  
  #>+ 15
  force-reedit:
@@ -87695,7 +106577,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87705,7 +106595,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -87713,7 +106603,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -87726,7 +106616,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -87740,7 +106630,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -87748,7 +106638,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -87756,7 +106646,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -87769,7 +106659,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -598,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -87778,7 +106668,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -636,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87790,7 +106680,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -917,7 +926,7 @@
+@@ -917,7 +925,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -87799,41 +106689,48 @@
  
  #>+ 4
  clean-ui:
-@@ -929,28 +938,28 @@
+@@ -929,29 +937,29 @@
  
  #>+ 25
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/hisc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/hisc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knetattach.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/hisc-app-knetattach.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
  	$(INSTALL_DATA) $(srcdir)/hi22-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/knetattach.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/hi32-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knetattach.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-knetattach.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/knetattach.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/knetattach.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/knetattach.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/knetattach.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/knetattach.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/knetattach.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/knetattach.png
  
  #>+ 15
+ force-reedit:
 --- konqueror/about/Makefile.in
 +++ konqueror/about/Makefile.in
 @@ -155,6 +155,7 @@
@@ -87844,7 +106741,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87854,7 +106759,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -87862,7 +106767,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -87875,7 +106780,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -87889,7 +106794,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -87897,7 +106802,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -87905,7 +106810,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -87918,7 +106823,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -605,7 +614,7 @@
+@@ -605,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -87927,7 +106832,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +652,9 @@
+@@ -643,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -87949,7 +106854,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -317,6 +318,9 @@
+@@ -267,7 +268,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -317,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -87959,7 +106872,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -367,6 +371,7 @@
+@@ -367,6 +370,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -87967,7 +106880,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -374,12 +379,9 @@
+@@ -374,12 +378,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -87980,7 +106893,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -400,10 +402,13 @@
+@@ -400,10 +401,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -87994,7 +106907,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -412,6 +417,7 @@
+@@ -412,6 +416,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88002,7 +106915,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -573,6 +579,7 @@
+@@ -573,6 +578,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -88010,7 +106923,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -580,10 +587,12 @@
+@@ -580,10 +586,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -88023,7 +106936,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -630,7 +639,7 @@
+@@ -630,7 +638,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -88032,7 +106945,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +677,9 @@
+@@ -668,9 +676,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88054,7 +106967,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88064,7 +106985,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -88072,7 +106993,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -88085,7 +107006,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88099,7 +107020,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88107,7 +107028,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -88115,7 +107036,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -88128,7 +107049,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -88137,7 +107058,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88159,7 +107080,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -320,6 +321,9 @@
+@@ -270,7 +271,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -320,6 +320,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88169,7 +107098,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -370,6 +374,7 @@
+@@ -370,6 +373,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -88177,7 +107106,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -377,12 +382,9 @@
+@@ -377,12 +381,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -88190,7 +107119,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -403,10 +405,13 @@
+@@ -403,10 +404,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88204,7 +107133,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -415,6 +420,7 @@
+@@ -415,6 +419,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88212,7 +107141,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -576,6 +582,7 @@
+@@ -576,6 +581,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -88220,7 +107149,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -583,10 +590,12 @@
+@@ -583,10 +589,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -88233,7 +107162,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -638,7 +647,7 @@
+@@ -638,7 +646,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -88242,7 +107171,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -676,9 +685,9 @@
+@@ -676,9 +684,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88254,7 +107183,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1131,32 +1140,32 @@
+@@ -1131,18 +1139,18 @@
  mocs: updater.moc
  
  #>+ 3
@@ -88278,103 +107207,92 @@
 +mocs: importers.moc
  
  #>+ 3
--bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
--	$(MOC) $(srcdir)/bookmarkinfo.h -o bookmarkinfo.moc
-+testlink.moc: $(srcdir)/testlink.h
-+	$(MOC) $(srcdir)/testlink.h -o testlink.moc
+ bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
+@@ -1152,18 +1160,18 @@
+ mocs: bookmarkinfo.moc
  
- #>+ 2
--mocs: bookmarkinfo.moc
-+mocs: testlink.moc
- 
  #>+ 3
 -kebsearchline.moc: $(srcdir)/kebsearchline.h
 -	$(MOC) $(srcdir)/kebsearchline.h -o kebsearchline.moc
-+dcop.moc: $(srcdir)/dcop.h
-+	$(MOC) $(srcdir)/dcop.h -o dcop.moc
++testlink.moc: $(srcdir)/testlink.h
++	$(MOC) $(srcdir)/testlink.h -o testlink.moc
  
  #>+ 2
 -mocs: kebsearchline.moc
-+mocs: dcop.moc
++mocs: testlink.moc
  
  #>+ 3
- listview.moc: $(srcdir)/listview.h
-@@ -1166,22 +1175,22 @@
- mocs: listview.moc
- 
- #>+ 3
--dcop.moc: $(srcdir)/dcop.h
--	$(MOC) $(srcdir)/dcop.h -o dcop.moc
+-listview.moc: $(srcdir)/listview.h
+-	$(MOC) $(srcdir)/listview.h -o listview.moc
 +kebsearchline.moc: $(srcdir)/kebsearchline.h
 +	$(MOC) $(srcdir)/kebsearchline.h -o kebsearchline.moc
  
  #>+ 2
--mocs: dcop.moc
+-mocs: listview.moc
 +mocs: kebsearchline.moc
  
  #>+ 3
+ dcop.moc: $(srcdir)/dcop.h
+@@ -1173,18 +1181,18 @@
+ mocs: dcop.moc
+ 
+ #>+ 3
 -testlink.moc: $(srcdir)/testlink.h
 -	$(MOC) $(srcdir)/testlink.h -o testlink.moc
-+bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
-+	$(MOC) $(srcdir)/bookmarkinfo.h -o bookmarkinfo.moc
++listview.moc: $(srcdir)/listview.h
++	$(MOC) $(srcdir)/listview.h -o listview.moc
  
  #>+ 2
 -mocs: testlink.moc
-+mocs: bookmarkinfo.moc
++mocs: listview.moc
  
  #>+ 3
  clean-metasources:
 -	-rm -f  favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc importers.moc toplevel.moc bookmarkinfo.moc kebsearchline.moc listview.moc dcop.moc testlink.moc
-+	-rm -f  favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc toplevel.moc importers.moc testlink.moc dcop.moc listview.moc kebsearchline.moc bookmarkinfo.moc
++	-rm -f  favicons.moc actionsimpl.moc bookmarkiterator.moc updater.moc toplevel.moc importers.moc bookmarkinfo.moc testlink.moc kebsearchline.moc dcop.moc listview.moc
  
  #>+ 2
- KDE_DIST=exporters.h importers.h kebsearchline.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc settings.kcfgc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h keditbookmarks.kcfg Makefile.am 
-@@ -1202,20 +1211,20 @@
+-KDE_DIST=exporters.h importers.h kebsearchline.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc settings.kcfgc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h keditbookmarks.kcfg Makefile.am 
++KDE_DIST=exporters.h importers.h kebsearchline.h DESIGN updater.h bookmarkiterator.h Makefile.in uninstall.desktop listview.h keditbookmarksui.rc settings.kcfgc favicons.h bookmarkinfo.h keditbookmarks-genui.rc toplevel.h cr48-app-keditbookmarks.png testlink.h dcop.h cr32-app-keditbookmarks.png cr64-app-keditbookmarks.png actionsimpl.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h keditbookmarks.kcfg Makefile.am 
  
+ #>+ 5
+ clean-idl:
+@@ -1202,20 +1210,20 @@
+ 
  #>+ 16
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
 +	$(INSTALL_DATA) $(srcdir)/cr32-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-keditbookmarks.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/keditbookmarks.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/keditbookmarks.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/keditbookmarks.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/keditbookmarks.png
  
  #>+ 15
  force-reedit:
-@@ -1256,7 +1265,7 @@
+@@ -1256,7 +1264,7 @@
  
  
  #>+ 11
 -libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp  settings.h $(srcdir)/toplevel.cpp  settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp  settings.h  favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc importers.moc toplevel.moc testlink.moc dcop.moc listview.moc bookmarkinfo.moc kebsearchline.moc
-+libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp  settings.h $(srcdir)/toplevel.cpp  settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp  settings.h  favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc toplevel.moc importers.moc bookmarkinfo.moc kebsearchline.moc listview.moc testlink.moc dcop.moc
++libkdeinit_keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/listview.cpp  settings.h $(srcdir)/toplevel.cpp  settings.h $(srcdir)/actionsimpl.cpp $(srcdir)/commands.cpp $(srcdir)/importers.cpp $(srcdir)/dcop.cpp $(srcdir)/bookmarkiterator.cpp $(srcdir)/testlink.cpp $(srcdir)/favicons.cpp $(srcdir)/updater.cpp $(srcdir)/exporters.cpp $(srcdir)/bookmarkinfo.cpp $(srcdir)/kebsearchline.cpp dcop_skel.cpp kbookmarknotifier_stub.cpp settings.cpp  settings.h  favicons.moc bookmarkiterator.moc actionsimpl.moc updater.moc toplevel.moc importers.moc listview.moc dcop.moc kebsearchline.moc bookmarkinfo.moc testlink.moc
  	@echo 'creating libkdeinit_keditbookmarks_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_keditbookmarks_la.all_cpp.files libkdeinit_keditbookmarks_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
-@@ -1339,8 +1348,8 @@
- nmcheck: 
- testlink.lo: testlink.moc 
- $(srcdir)/importers.cpp: kbookmarknotifier_stub.h settings.h 
--bookmarkinfo.o: bookmarkinfo.moc 
- favicons.o: favicons.moc 
-+bookmarkinfo.o: bookmarkinfo.moc 
- $(srcdir)/bookmarkinfo.cpp: kbookmarknotifier_stub.h settings.h 
- bookmarkinfo.lo: bookmarkinfo.moc 
- $(srcdir)/bookmarkiterator.cpp: kbookmarknotifier_stub.h settings.h 
 --- konqueror/kttsplugin/Makefile.in
 +++ konqueror/kttsplugin/Makefile.in
 @@ -150,6 +150,7 @@
@@ -88385,7 +107303,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -294,6 +295,9 @@
+@@ -244,7 +245,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88395,7 +107321,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,6 +348,7 @@
+@@ -344,6 +347,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -88403,7 +107329,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -351,12 +356,9 @@
+@@ -351,12 +355,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -88416,7 +107342,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,10 +379,13 @@
+@@ -377,10 +378,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88430,7 +107356,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -389,6 +394,7 @@
+@@ -389,6 +393,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88438,7 +107364,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -550,6 +556,7 @@
+@@ -550,6 +555,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -88446,7 +107372,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -557,10 +564,12 @@
+@@ -557,10 +563,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -88459,7 +107385,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -596,7 +605,7 @@
+@@ -596,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -88468,7 +107394,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +643,9 @@
+@@ -634,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88490,7 +107416,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -307,6 +308,9 @@
+@@ -257,7 +258,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -307,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88500,7 +107434,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -357,6 +361,7 @@
+@@ -357,6 +360,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -88508,7 +107442,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -364,12 +369,9 @@
+@@ -364,12 +368,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -88521,7 +107455,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -390,10 +392,13 @@
+@@ -390,10 +391,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88535,7 +107469,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -402,6 +407,7 @@
+@@ -402,6 +406,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88543,7 +107477,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -563,6 +569,7 @@
+@@ -563,6 +568,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -88551,7 +107485,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -570,10 +577,12 @@
+@@ -570,10 +576,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -88564,7 +107498,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -626,7 +635,7 @@
+@@ -626,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -88573,7 +107507,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -664,9 +673,9 @@
+@@ -664,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88585,71 +107519,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1015,13 +1024,6 @@
- mocs: konq_infolistviewwidget.moc
- 
- #>+ 3
--konq_treeviewwidget.moc: $(srcdir)/konq_treeviewwidget.h
--	$(MOC) $(srcdir)/konq_treeviewwidget.h -o konq_treeviewwidget.moc
--
--#>+ 2
--mocs: konq_treeviewwidget.moc
--
--#>+ 3
- konq_textviewwidget.moc: $(srcdir)/konq_textviewwidget.h
- 	$(MOC) $(srcdir)/konq_textviewwidget.h -o konq_textviewwidget.moc
- 
-@@ -1029,11 +1031,11 @@
- mocs: konq_textviewwidget.moc
- 
- #>+ 3
--konq_listviewwidget.moc: $(srcdir)/konq_listviewwidget.h
--	$(MOC) $(srcdir)/konq_listviewwidget.h -o konq_listviewwidget.moc
-+konq_treeviewwidget.moc: $(srcdir)/konq_treeviewwidget.h
-+	$(MOC) $(srcdir)/konq_treeviewwidget.h -o konq_treeviewwidget.moc
- 
- #>+ 2
--mocs: konq_listviewwidget.moc
-+mocs: konq_treeviewwidget.moc
- 
- #>+ 3
- konq_listview.moc: $(srcdir)/konq_listview.h
-@@ -1043,8 +1045,15 @@
- mocs: konq_listview.moc
- 
- #>+ 3
-+konq_listviewwidget.moc: $(srcdir)/konq_listviewwidget.h
-+	$(MOC) $(srcdir)/konq_listviewwidget.h -o konq_listviewwidget.moc
-+
-+#>+ 2
-+mocs: konq_listviewwidget.moc
-+
-+#>+ 3
- clean-metasources:
--	-rm -f  konq_infolistviewwidget.moc konq_treeviewwidget.moc konq_textviewwidget.moc konq_listviewwidget.moc konq_listview.moc
-+	-rm -f  konq_infolistviewwidget.moc konq_textviewwidget.moc konq_treeviewwidget.moc konq_listview.moc konq_listviewwidget.moc
- 
- #>+ 2
- KDE_DIST=konq_infolistview.rc konq_detailedlistview.desktop konq_treeviewwidget.h konq_listviewitems.h konq_textview.rc Makefile.in konq_infolistviewitem.h konq_treeview.rc konq_listview.h konq_treeview.desktop konq_infolistview.desktop konq_treeviewitem.h konq_textviewitem.h konq_textviewwidget.h konq_textview.desktop konq_listview.kcfg konq_listviewsettings.kcfgc konq_infolistviewwidget.h konq_listviewwidget.h Makefile.am konq_detailedlistview.rc 
-@@ -1100,7 +1109,7 @@
- 
- 
- #>+ 11
--konq_listview_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_listview.cc  konq_listviewsettings.h $(srcdir)/konq_listviewwidget.cc  konq_listviewsettings.h $(srcdir)/konq_listviewitems.cc $(srcdir)/konq_treeviewwidget.cc $(srcdir)/konq_treeviewitem.cc $(srcdir)/konq_textviewwidget.cc $(srcdir)/konq_textviewitem.cc $(srcdir)/konq_infolistviewwidget.cc $(srcdir)/konq_infolistviewitem.cc konq_listviewsettings.cc  konq_listviewsettings.h  konq_infolistviewwidget.moc konq_textviewwidget.moc konq_treeviewwidget.moc konq_listview.moc konq_listviewwidget.moc
-+konq_listview_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_listview.cc  konq_listviewsettings.h $(srcdir)/konq_listviewwidget.cc  konq_listviewsettings.h $(srcdir)/konq_listviewitems.cc $(srcdir)/konq_treeviewwidget.cc $(srcdir)/konq_treeviewitem.cc $(srcdir)/konq_textviewwidget.cc $(srcdir)/konq_textviewitem.cc $(srcdir)/konq_infolistviewwidget.cc $(srcdir)/konq_infolistviewitem.cc konq_listviewsettings.cc  konq_listviewsettings.h  konq_infolistviewwidget.moc konq_treeviewwidget.moc konq_textviewwidget.moc konq_listviewwidget.moc konq_listview.moc
- 	@echo 'creating konq_listview_la.all_cc.cc ...'; \
- 	rm -f konq_listview_la.all_cc.files konq_listview_la.all_cc.final; \
- 	echo "#define KDE_USE_FINAL 1" >> konq_listview_la.all_cc.final; \
-@@ -1149,8 +1158,8 @@
- nmcheck-am: nmcheck
- $(srcdir)/konq_infolistviewwidget.cc: konq_listviewsettings.h 
- konq_textviewwidget.o: konq_textviewwidget.moc 
--konq_listviewwidget.o: konq_listviewwidget.moc 
- konq_textviewwidget.lo: konq_textviewwidget.moc 
-+konq_listviewwidget.o: konq_listviewwidget.moc 
- konq_listview.o: konq_listview.moc 
- $(srcdir)/konq_infolistviewitem.cc: konq_listviewsettings.h 
- $(srcdir)/konq_textviewwidget.cc: konq_listviewsettings.h 
 --- konqueror/Makefile.in
 +++ konqueror/Makefile.in
 @@ -220,6 +220,7 @@
@@ -88660,7 +107529,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -364,6 +365,9 @@
+@@ -314,7 +315,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -364,6 +364,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88670,7 +107547,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -414,6 +418,7 @@
+@@ -414,6 +417,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -88678,7 +107555,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -421,12 +426,9 @@
+@@ -421,12 +425,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -88691,7 +107568,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -447,10 +449,13 @@
+@@ -447,10 +448,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88705,7 +107582,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -459,6 +464,7 @@
+@@ -459,6 +463,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88713,7 +107590,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -620,6 +626,7 @@
+@@ -620,6 +625,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -88721,7 +107598,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -627,10 +634,12 @@
+@@ -627,10 +633,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -88734,7 +107611,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -732,7 +741,7 @@
+@@ -732,7 +740,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -88743,7 +107620,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -770,9 +779,9 @@
+@@ -770,9 +778,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88755,46 +107632,68 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1491,18 +1500,18 @@
- mocs: konq_misc.moc
+@@ -1484,6 +1492,13 @@
+ mocs: konq_frame.moc
  
  #>+ 3
--konq_browseriface.moc: $(srcdir)/konq_browseriface.h
--	$(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc
 +konq_tabs.moc: $(srcdir)/konq_tabs.h
 +	$(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
- 
- #>+ 2
--mocs: konq_browseriface.moc
++
++#>+ 2
 +mocs: konq_tabs.moc
++
++#>+ 3
+ konq_misc.moc: $(srcdir)/konq_misc.h
+ 	$(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
  
+@@ -1498,11 +1513,11 @@
+ mocs: konq_browseriface.moc
+ 
  #>+ 3
 -konq_tabs.moc: $(srcdir)/konq_tabs.h
 -	$(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
-+konq_browseriface.moc: $(srcdir)/konq_browseriface.h
-+	$(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc
++konq_view.moc: $(srcdir)/konq_view.h
++	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
  
  #>+ 2
 -mocs: konq_tabs.moc
-+mocs: konq_browseriface.moc
++mocs: konq_view.moc
  
  #>+ 3
  konq_run.moc: $(srcdir)/konq_run.h
-@@ -1557,7 +1566,7 @@
+@@ -1512,13 +1527,6 @@
+ mocs: konq_run.moc
  
  #>+ 3
+-konq_view.moc: $(srcdir)/konq_view.h
+-	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
+-
+-#>+ 2
+-mocs: konq_view.moc
+-
+-#>+ 3
+ konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
+ 	$(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
+ 
+@@ -1557,10 +1565,10 @@
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_misc.moc konq_browseriface.moc konq_tabs.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
-+	-rm -f  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_misc.moc konq_tabs.moc konq_browseriface.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
++	-rm -f  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_mainwindow_p.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc konq_extensionmanager.moc
  
  #>+ 2
- KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop konq-simplebrowser.rc IDEAS konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop konq_settingsxt.kcfgc Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am 
-@@ -1620,7 +1629,7 @@
+-KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop konq-simplebrowser.rc IDEAS konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop konq_settingsxt.kcfgc Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am 
++KDE_DIST=profile_midnightcommander.desktop konqueror.kcfg profile_tabbedbrowsing.desktop DESIGN Makefile.in uninstall.desktop IDEAS konq-simplebrowser.rc konqueror.rc konq_mainwindow_p.h DESIGN_config profile_simplebrowser.desktop konq_settingsxt.kcfgc Home.desktop kfmclient.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop convert_kdelnk.sh profile_filemanagement.desktop profile_kde_devel.desktop konquerorsu.desktop Makefile.am 
  
+ #>+ 6
+ clean-idl:
+@@ -1620,7 +1628,7 @@
  
+ 
  #>+ 11
 -libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc  konq_settingsxt.h $(srcdir)/KonquerorIface.cc  konq_settingsxt.h $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc  konq_settingsxt.h $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc  konq_settingsxt.h $(srcdir)/konq_viewmgr.cc  konq_settingsxt.h $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc  konq_settingsxt.h $(srcdir)/konq_actions.cc  konq_settingsxt.h $(srcdir)/konq_profiledlg.cc  konq_settingsxt.h $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc  konq_settingsxt.h $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_tabs.moc konq_misc.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
-+libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc  konq_settingsxt.h $(srcdir)/KonquerorIface.cc  konq_settingsxt.h $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc  konq_settingsxt.h $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc  konq_settingsxt.h $(srcdir)/konq_viewmgr.cc  konq_settingsxt.h $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc  konq_settingsxt.h $(srcdir)/konq_actions.cc  konq_settingsxt.h $(srcdir)/konq_profiledlg.cc  konq_settingsxt.h $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc  konq_settingsxt.h $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_misc.moc konq_tabs.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
++libkdeinit_konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc  konq_settingsxt.h $(srcdir)/KonquerorIface.cc  konq_settingsxt.h $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_guiclients.cc  konq_settingsxt.h $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc  konq_settingsxt.h $(srcdir)/konq_viewmgr.cc  konq_settingsxt.h $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_tabs.cc  konq_settingsxt.h $(srcdir)/konq_actions.cc  konq_settingsxt.h $(srcdir)/konq_profiledlg.cc  konq_settingsxt.h $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc $(srcdir)/konq_mainwindow.cc  konq_settingsxt.h $(srcdir)/konq_extensionmanager.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc  konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_mainwindow_p.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_tabs.moc konq_misc.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_extensionmanager.moc konq_combo.moc
  	@echo 'creating libkdeinit_konqueror_la.all_cc.cc ...'; \
  	rm -f libkdeinit_konqueror_la.all_cc.files libkdeinit_konqueror_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_konqueror_la.all_cc.final; \
@@ -88808,7 +107707,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88818,7 +107725,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -88826,7 +107733,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -88839,7 +107746,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88853,7 +107760,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88861,7 +107768,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -88869,7 +107776,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -88882,7 +107789,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -88891,7 +107798,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -88903,30 +107810,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -735,20 +744,20 @@
+@@ -735,20 +743,20 @@
  #>+ 17
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-kde1.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde1.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-kde2.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-kde2.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-kde3.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde3.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-kde4.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde4.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-action-kde6.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde5.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-kde2.png $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
 -	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
  	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde1.png
--	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
+ 	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
  	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde3.png
  	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde4.png
++	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
 +	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde6.png
-+	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde5.png
-+	-rm -f $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions/kde2.png
  
  #>+ 15
  force-reedit:
@@ -88940,7 +107845,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -88950,7 +107863,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -88958,7 +107871,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -88971,7 +107884,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -88985,7 +107898,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -88993,7 +107906,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -89001,7 +107914,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -89014,7 +107927,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -556,7 +565,7 @@
+@@ -556,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -89023,7 +107936,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +603,9 @@
+@@ -594,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89045,7 +107958,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89055,7 +107976,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -89063,7 +107984,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -89076,7 +107997,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -89090,7 +108011,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -89098,7 +108019,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -89106,7 +108027,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -89119,7 +108040,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -560,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -89128,7 +108049,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -598,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89140,7 +108061,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -898,39 +907,39 @@
+@@ -898,39 +906,39 @@
  
  #>+ 35
  install-kde-icons:
@@ -89149,53 +108070,53 @@
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
 -	$(INSTALL_DATA) $(srcdir)/hi128-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
  	$(INSTALL_DATA) $(srcdir)/hi22-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfm.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/hi32-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
++	$(INSTALL_DATA) $(srcdir)/hi32-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfm.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/hi48-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
--	$(INSTALL_DATA) $(srcdir)/hi16-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-konqueror.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 +	$(INSTALL_DATA) $(srcdir)/hisc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kfm.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfm.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konqueror.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konqueror.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfm.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konqueror.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konqueror.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
  
  #>+ 15
  force-reedit:
@@ -89209,7 +108130,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89219,7 +108148,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -89227,7 +108156,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -89240,7 +108169,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -89254,7 +108183,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -89262,7 +108191,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -89270,7 +108199,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -89283,7 +108212,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -556,7 +565,7 @@
+@@ -556,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -89292,7 +108221,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +603,9 @@
+@@ -594,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89314,7 +108243,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89324,7 +108261,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -89332,7 +108269,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -89345,7 +108282,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -89359,7 +108296,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -89367,7 +108304,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -89375,7 +108312,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -89388,7 +108325,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -606,7 +615,7 @@
+@@ -606,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -89397,7 +108334,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +653,9 @@
+@@ -644,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89419,7 +108356,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89429,7 +108374,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -89437,7 +108382,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -89450,7 +108395,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -89464,7 +108409,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -89472,7 +108417,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -89480,7 +108425,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -89493,7 +108438,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -560,7 +568,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -89502,7 +108447,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -598,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89514,6 +108459,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -760,7 +768,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=text-perl-print.desktop text-c-print.desktop text-diff-print.desktop text-python-print.desktop text-pas-print.desktop text-c++-print.desktop text-makefile-print.desktop Makefile.in text-ch-print.desktop text-print.desktop text-html-print.desktop text-tcl-print.desktop text-c++h-print.desktop text-css-print.desktop text-ada-print.desktop text-tex-print.desktop text-log-print.desktop text-java-print.desktop text-xml-print.desktop text-xslt-print.desktop Makefile.am 
++KDE_DIST=text-perl-print.desktop text-c-print.desktop text-diff-print.desktop text-python-print.desktop text-c++-print.desktop text-pas-print.desktop text-makefile-print.desktop Makefile.in text-ch-print.desktop text-print.desktop text-html-print.desktop text-tcl-print.desktop text-c++h-print.desktop text-ada-print.desktop text-css-print.desktop text-tex-print.desktop text-log-print.desktop text-java-print.desktop text-xml-print.desktop text-xslt-print.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
 --- konqueror/remoteencodingplugin/Makefile.in
 +++ konqueror/remoteencodingplugin/Makefile.in
 @@ -151,6 +151,7 @@
@@ -89524,7 +108478,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -295,6 +296,9 @@
+@@ -245,7 +246,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89534,7 +108496,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,6 +349,7 @@
+@@ -345,6 +348,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -89542,7 +108504,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -352,12 +357,9 @@
+@@ -352,12 +356,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -89555,7 +108517,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,10 +380,13 @@
+@@ -378,10 +379,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -89569,7 +108531,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -390,6 +395,7 @@
+@@ -390,6 +394,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -89577,7 +108539,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -551,6 +557,7 @@
+@@ -551,6 +556,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -89585,7 +108547,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -558,10 +565,12 @@
+@@ -558,10 +564,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -89598,7 +108560,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -597,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -89607,7 +108569,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -635,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89629,7 +108591,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89639,7 +108609,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -89647,7 +108617,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -89660,7 +108630,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -89674,7 +108644,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -89682,7 +108652,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -89690,7 +108660,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -89703,7 +108673,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -604,7 +613,7 @@
+@@ -604,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -89712,7 +108682,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +651,9 @@
+@@ -642,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89734,7 +108704,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -339,6 +340,9 @@
+@@ -289,7 +290,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -339,6 +339,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89744,7 +108722,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -389,6 +393,7 @@
+@@ -389,6 +392,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -89752,7 +108730,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -396,12 +401,9 @@
+@@ -396,12 +400,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -89765,7 +108743,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -422,10 +424,13 @@
+@@ -422,10 +423,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -89779,7 +108757,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -434,6 +439,7 @@
+@@ -434,6 +438,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -89787,7 +108765,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -595,6 +601,7 @@
+@@ -595,6 +600,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -89795,7 +108773,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -602,10 +609,12 @@
+@@ -602,10 +608,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -89808,7 +108786,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -669,7 +678,7 @@
+@@ -669,7 +677,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -89817,7 +108795,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -707,9 +716,9 @@
+@@ -707,9 +715,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89829,40 +108807,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1233,18 +1242,18 @@
- 
- 
- #>+ 3
--konqsidebarplugin.moc: $(srcdir)/konqsidebarplugin.h
--	$(MOC) $(srcdir)/konqsidebarplugin.h -o konqsidebarplugin.moc
-+konqsidebar.moc: $(srcdir)/konqsidebar.h
-+	$(MOC) $(srcdir)/konqsidebar.h -o konqsidebar.moc
- 
- #>+ 2
--mocs: konqsidebarplugin.moc
-+mocs: konqsidebar.moc
- 
- #>+ 3
--konqsidebar.moc: $(srcdir)/konqsidebar.h
--	$(MOC) $(srcdir)/konqsidebar.h -o konqsidebar.moc
-+konqsidebarplugin.moc: $(srcdir)/konqsidebarplugin.h
-+	$(MOC) $(srcdir)/konqsidebarplugin.h -o konqsidebarplugin.moc
- 
- #>+ 2
--mocs: konqsidebar.moc
-+mocs: konqsidebarplugin.moc
- 
- #>+ 3
- sidebar_widget.moc: $(srcdir)/sidebar_widget.h
-@@ -1264,7 +1273,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  konqsidebarplugin.moc konqsidebar.moc sidebar_widget.moc
-+	-rm -f  konqsidebar.moc konqsidebarplugin.moc sidebar_widget.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in move_konqsidebartng_entries.sh konq_sidebartng.desktop konqsidebartng.rc konqsidebartng.upd Makefile.am 
 --- konqueror/sidebar/test/Makefile.in
 +++ konqueror/sidebar/test/Makefile.in
 @@ -168,6 +168,7 @@
@@ -89873,7 +108817,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -312,6 +313,9 @@
+@@ -262,7 +263,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -312,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89883,7 +108835,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -362,6 +366,7 @@
+@@ -362,6 +365,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -89891,7 +108843,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -369,12 +374,9 @@
+@@ -369,12 +373,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -89904,7 +108856,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -395,10 +397,13 @@
+@@ -395,10 +396,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -89918,7 +108870,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -407,6 +412,7 @@
+@@ -407,6 +411,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -89926,7 +108878,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -568,6 +574,7 @@
+@@ -568,6 +573,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -89934,7 +108886,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -575,10 +582,12 @@
+@@ -575,10 +581,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -89947,7 +108899,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -627,7 +636,7 @@
+@@ -627,7 +635,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -89956,7 +108908,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -665,9 +674,9 @@
+@@ -665,9 +673,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -89978,7 +108930,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -296,6 +297,9 @@
+@@ -246,7 +247,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -89988,7 +108948,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,6 +350,7 @@
+@@ -346,6 +349,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -89996,7 +108956,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -353,12 +358,9 @@
+@@ -353,12 +357,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -90009,7 +108969,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,10 +381,13 @@
+@@ -379,10 +380,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -90023,7 +108983,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -391,6 +396,7 @@
+@@ -391,6 +395,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -90031,7 +108991,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -552,6 +558,7 @@
+@@ -552,6 +557,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -90039,7 +108999,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -559,10 +566,12 @@
+@@ -559,10 +565,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -90052,7 +109012,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -594,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -90061,7 +109021,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -632,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90083,7 +109043,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -296,6 +297,9 @@
+@@ -246,7 +247,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90093,7 +109061,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,6 +350,7 @@
+@@ -346,6 +349,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -90101,7 +109069,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -353,12 +358,9 @@
+@@ -353,12 +357,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -90114,7 +109082,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,10 +381,13 @@
+@@ -379,10 +380,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -90128,7 +109096,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -391,6 +396,7 @@
+@@ -391,6 +395,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -90136,7 +109104,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -552,6 +558,7 @@
+@@ -552,6 +557,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -90144,7 +109112,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -559,10 +566,12 @@
+@@ -559,10 +565,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -90157,7 +109125,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -596,7 +605,7 @@
+@@ -596,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -90166,7 +109134,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +643,9 @@
+@@ -634,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90188,7 +109156,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -310,6 +311,9 @@
+@@ -260,7 +261,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -310,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90198,7 +109174,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -360,6 +364,7 @@
+@@ -360,6 +363,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -90206,7 +109182,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -367,12 +372,9 @@
+@@ -367,12 +371,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -90219,7 +109195,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -393,10 +395,13 @@
+@@ -393,10 +394,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -90233,7 +109209,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -405,6 +410,7 @@
+@@ -405,6 +409,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -90241,7 +109217,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -566,6 +572,7 @@
+@@ -566,6 +571,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -90249,7 +109225,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -573,10 +580,12 @@
+@@ -573,10 +579,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -90262,7 +109238,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -621,7 +630,7 @@
+@@ -621,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -90271,7 +109247,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -659,9 +668,9 @@
+@@ -659,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90293,7 +109269,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -284,6 +285,9 @@
+@@ -234,7 +235,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90303,7 +109287,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -334,6 +338,7 @@
+@@ -334,6 +337,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -90311,7 +109295,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -341,12 +346,9 @@
+@@ -341,12 +345,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -90324,7 +109308,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,10 +369,13 @@
+@@ -367,10 +368,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -90338,7 +109322,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -379,6 +384,7 @@
+@@ -379,6 +383,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -90346,7 +109330,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -540,6 +546,7 @@
+@@ -540,6 +545,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -90354,7 +109338,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -547,10 +554,12 @@
+@@ -547,10 +553,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -90367,7 +109351,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -588,7 +597,7 @@
+@@ -588,7 +596,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -90376,7 +109360,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +635,9 @@
+@@ -626,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90398,7 +109382,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90408,7 +109400,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -90416,7 +109408,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -90429,7 +109421,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -90443,7 +109435,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -90451,7 +109443,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -90459,7 +109451,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -90472,7 +109464,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -90481,7 +109473,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90503,7 +109495,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -277,6 +278,9 @@
+@@ -227,7 +228,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90513,7 +109513,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,6 +331,7 @@
+@@ -327,6 +330,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -90521,7 +109521,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -334,12 +339,9 @@
+@@ -334,12 +338,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -90534,7 +109534,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,10 +362,13 @@
+@@ -360,10 +361,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -90548,7 +109548,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -372,6 +377,7 @@
+@@ -372,6 +376,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -90556,7 +109556,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -533,6 +539,7 @@
+@@ -533,6 +538,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -90564,7 +109564,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -540,10 +547,12 @@
+@@ -540,10 +546,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -90577,7 +109577,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -571,7 +580,7 @@
+@@ -571,7 +579,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -90586,7 +109586,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +618,9 @@
+@@ -609,9 +617,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90608,7 +109608,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90618,7 +109626,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -90626,7 +109634,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -90639,7 +109647,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -90653,7 +109661,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -90661,7 +109669,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -90669,7 +109677,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -90682,7 +109690,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -90691,7 +109699,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90713,7 +109721,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90723,7 +109739,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -90731,7 +109747,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -90744,7 +109760,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -90758,7 +109774,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -90766,7 +109782,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -90774,7 +109790,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -90787,7 +109803,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -90796,7 +109812,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90818,7 +109834,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -318,6 +319,9 @@
+@@ -268,7 +269,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -318,6 +318,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90828,7 +109852,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -368,6 +372,7 @@
+@@ -368,6 +371,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -90836,7 +109860,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -375,12 +380,9 @@
+@@ -375,12 +379,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -90849,7 +109873,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,10 +403,13 @@
+@@ -401,10 +402,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -90863,7 +109887,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -413,6 +418,7 @@
+@@ -413,6 +417,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -90871,7 +109895,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -574,6 +580,7 @@
+@@ -574,6 +579,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -90879,7 +109903,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -581,10 +588,12 @@
+@@ -581,10 +587,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -90892,7 +109916,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -625,7 +634,7 @@
+@@ -625,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -90901,7 +109925,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +672,9 @@
+@@ -663,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -90923,7 +109947,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -90933,7 +109965,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -90941,7 +109973,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -90954,7 +109986,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -90968,7 +110000,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -90976,7 +110008,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -90984,7 +110016,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -90997,7 +110029,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -594,7 +603,6 @@
+@@ -594,7 +602,6 @@
  #plugin_DATA=websidebar.desktop
  pluginadddir = $(kde_datadir)/konqsidebartng/add
  pluginadd_DATA = webmodule_add.desktop
@@ -91005,7 +110037,7 @@
  html_DATA = websidebar.html
  #>- all: all-am
  #>+ 1
-@@ -602,7 +610,7 @@
+@@ -602,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -91014,7 +110046,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +648,9 @@
+@@ -640,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91036,7 +110068,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91046,7 +110086,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -91054,7 +110094,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -91067,7 +110107,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -91081,7 +110121,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -91089,7 +110129,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -91097,7 +110137,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -91110,7 +110150,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -560,7 +569,7 @@
+@@ -560,7 +568,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -91119,7 +110159,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +607,9 @@
+@@ -598,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91141,7 +110181,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91151,7 +110199,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -91159,7 +110207,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -91172,7 +110220,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -91186,7 +110234,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -91194,7 +110242,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -91202,7 +110250,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -91215,7 +110263,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -546,7 +555,7 @@
+@@ -546,7 +554,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -91224,7 +110272,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -584,9 +593,9 @@
+@@ -584,9 +592,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91246,7 +110294,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91256,7 +110312,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -91264,7 +110320,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -91277,7 +110333,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -91291,7 +110347,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -91299,7 +110355,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -91307,7 +110363,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -91320,7 +110376,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -91329,7 +110385,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91351,7 +110407,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -357,6 +358,9 @@
+@@ -307,7 +308,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -357,6 +357,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91361,7 +110425,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -407,6 +411,7 @@
+@@ -407,6 +410,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -91369,7 +110433,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -414,12 +419,9 @@
+@@ -414,12 +418,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -91382,7 +110446,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -440,10 +442,13 @@
+@@ -440,10 +441,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -91396,7 +110460,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -452,6 +457,7 @@
+@@ -452,6 +456,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -91404,7 +110468,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -613,6 +619,7 @@
+@@ -613,6 +618,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -91412,7 +110476,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -620,10 +627,12 @@
+@@ -620,10 +626,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -91425,7 +110489,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -728,7 +737,7 @@
+@@ -728,7 +736,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -91434,7 +110498,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -766,9 +775,9 @@
+@@ -766,9 +774,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91446,7 +110510,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1244,18 +1253,18 @@
+@@ -1244,18 +1252,18 @@
  mocs: TEWidget.moc
  
  #>+ 3
@@ -91471,32 +110535,7 @@
  
  #>+ 3
  konsole.moc: $(srcdir)/konsole.h
-@@ -1279,18 +1288,18 @@
- mocs: zmodem_dialog.moc
- 
- #>+ 3
--TEmuVt102.moc: $(srcdir)/TEmuVt102.h
--	$(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
-+session.moc: $(srcdir)/session.h
-+	$(MOC) $(srcdir)/session.h -o session.moc
- 
- #>+ 2
--mocs: TEmuVt102.moc
-+mocs: session.moc
- 
- #>+ 3
--session.moc: $(srcdir)/session.h
--	$(MOC) $(srcdir)/session.h -o session.moc
-+TEmuVt102.moc: $(srcdir)/TEmuVt102.h
-+	$(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
- 
- #>+ 2
--mocs: session.moc
-+mocs: TEmuVt102.moc
- 
- #>+ 3
- konsole_part.moc: $(srcdir)/konsole_part.h
-@@ -1300,18 +1309,18 @@
+@@ -1300,18 +1308,18 @@
  mocs: konsole_part.moc
  
  #>+ 3
@@ -91521,34 +110560,25 @@
  
  #>+ 5
  kwrited.kidl: $(srcdir)/kwrited.h $(DCOP_DEPENDENCIES)
-@@ -1330,7 +1339,7 @@
+@@ -1330,7 +1338,7 @@
  
  #>+ 3
  clean-metasources:
 -	-rm -f  kwrited.moc TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc printsettings.moc
-+	-rm -f  kwrited.moc TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc session.moc TEmuVt102.moc konsole_part.moc printsettings.moc TEPty.moc
++	-rm -f  kwrited.moc TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc printsettings.moc TEPty.moc
  
  #>+ 2
  KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults Makefile.in konsole_part.h konsoleiface.h linefont.src Makefile.am 
-@@ -1390,7 +1399,7 @@
+@@ -1390,7 +1398,7 @@
  
  
  #>+ 11
 -libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc printsettings.moc TEPty.moc
-+libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc session.moc TEmuVt102.moc TEPty.moc printsettings.moc
++libkdeinit_konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/printsettings.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc zmodem_dialog.moc TEmuVt102.moc session.moc TEPty.moc printsettings.moc
  	@echo 'creating libkdeinit_konsole_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_konsole_la.all_cpp.files libkdeinit_konsole_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_konsole_la.all_cpp.final; \
-@@ -1414,7 +1423,7 @@
- 	rm -f kded_kwrited_la.all_cpp.final kded_kwrited_la.all_cpp.files
- 
- #>+ 11
--libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc TEmulation.moc zmodem_dialog.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc
-+libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/zmodem_dialog.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp  TEWidget.moc TEmulation.moc zmodem_dialog.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc
- 	@echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \
- 	rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkonsolepart_la.all_cpp.final; \
-@@ -1468,8 +1477,8 @@
+@@ -1468,8 +1476,8 @@
  	@rm -f konsole$(EXEEXT)
  	$(CXXLINK) $(konsole_LDFLAGS) $(konsole_OBJECTS) $(konsole_LDADD) $(LIBS)
  
@@ -91568,7 +110598,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -294,6 +295,9 @@
+@@ -244,7 +245,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91578,7 +110616,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,6 +348,7 @@
+@@ -344,6 +347,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -91586,7 +110624,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -351,12 +356,9 @@
+@@ -351,12 +355,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -91599,7 +110637,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,10 +379,13 @@
+@@ -377,10 +378,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -91613,7 +110651,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -389,6 +394,7 @@
+@@ -389,6 +393,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -91621,7 +110659,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -550,6 +556,7 @@
+@@ -550,6 +555,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -91629,7 +110667,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -557,10 +564,12 @@
+@@ -557,10 +563,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -91642,7 +110680,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -601,7 +610,7 @@
+@@ -601,7 +609,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -91651,7 +110689,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +648,9 @@
+@@ -639,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91663,6 +110701,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-updateSCRIPTS: $(update_SCRIPTS)
  	@$(NORMAL_INSTALL)
+@@ -1086,7 +1094,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=eventsrc terminalemulator.desktop konsole.upd kcmkonsole.desktop Makefile.in README.konsole_kiosk README.ports konsolepart.desktop configure.in.in schemaStrip.pl tips kwrited.desktop konsole-script.desktop README.unicode konsolehere.desktop README.fonts konsolesu.desktop README.utmp README.keyboard konsole.desktop Makefile.am 
++KDE_DIST=eventsrc terminalemulator.desktop konsole.upd kcmkonsole.desktop Makefile.in README.konsole_kiosk README.ports konsolepart.desktop configure.in.in schemaStrip.pl tips kwrited.desktop konsole-script.desktop README.unicode konsolehere.desktop README.fonts konsolesu.desktop README.keyboard konsole.desktop Makefile.am 
+ 
+ #>+ 2
+ docs-am:
 --- konsole/other/icons/Makefile.in
 +++ konsole/other/icons/Makefile.in
 @@ -107,6 +107,7 @@
@@ -91673,7 +110720,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91683,7 +110738,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -91691,7 +110746,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -91704,7 +110759,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -91718,7 +110773,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -91726,7 +110781,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -91734,7 +110789,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -91747,7 +110802,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -544,7 +553,7 @@
+@@ -544,7 +552,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -91756,7 +110811,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +591,9 @@
+@@ -582,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91768,7 +110823,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -727,46 +736,46 @@
+@@ -727,7 +735,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -91777,63 +110832,61 @@
  
  #>+ 2
  docs-am:
- 
+@@ -735,37 +743,37 @@
  #>+ 35
  install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
+ 	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
  	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-activity.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
  	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions
 -	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
-+	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-silence.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
  	$(INSTALL_DATA) $(srcdir)/cr16-action-konsolered.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermred.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-konsoleblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-opentermblue.png $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
- 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
- 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
- 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
 -	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
 -	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
--	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
--	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
 -	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
- 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
+-	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/activity.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
 +	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/silence.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermred.png
- 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermred.png
--	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
--	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/opentermblue.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsolered.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsolered.png
+ 	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/konsoleblue.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/32x32/actions/konsoleblue.png
 +	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions/opentermblue.png
++	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
  	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermred.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsoleblue.png
-+	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/opentermblue.png
  
  #>+ 15
- force-reedit:
 --- konsole/other/Makefile.in
 +++ konsole/other/Makefile.in
 @@ -135,6 +135,7 @@
@@ -91844,7 +110897,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -279,6 +280,9 @@
+@@ -229,7 +230,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -279,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -91854,7 +110915,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -329,6 +333,7 @@
+@@ -329,6 +332,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -91862,7 +110923,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -336,12 +341,9 @@
+@@ -336,12 +340,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -91875,7 +110936,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -362,10 +364,13 @@
+@@ -362,10 +363,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -91889,7 +110950,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -374,6 +379,7 @@
+@@ -374,6 +378,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -91897,7 +110958,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -535,6 +541,7 @@
+@@ -535,6 +540,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -91905,7 +110966,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -542,10 +549,12 @@
+@@ -542,10 +548,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -91918,7 +110979,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -587,7 +596,7 @@
+@@ -587,7 +595,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -91927,7 +110988,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +634,9 @@
+@@ -625,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -91939,7 +111000,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -966,29 +975,29 @@
+@@ -966,29 +974,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -91947,37 +111008,37 @@
 -	$(INSTALL_DATA) $(srcdir)/hi64-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
  	$(INSTALL_DATA) $(srcdir)/hisc-app-konsole.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konsole.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/hi32-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konsole.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
 -	$(INSTALL_DATA) $(srcdir)/hi16-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konsole.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/konsole.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/konsole.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/konsole.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/konsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/konsole.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/konsole.png
  
  #>+ 15
  force-reedit:
@@ -91991,7 +111052,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92001,7 +111070,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -92009,7 +111078,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -92022,7 +111091,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -92036,7 +111105,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -92044,7 +111113,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -92052,7 +111121,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -92065,7 +111134,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -92074,7 +111143,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92096,7 +111165,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -299,6 +300,9 @@
+@@ -249,7 +250,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92106,7 +111183,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -349,6 +353,7 @@
+@@ -349,6 +352,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -92114,7 +111191,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -356,12 +361,9 @@
+@@ -356,12 +360,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -92127,7 +111204,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -382,10 +384,13 @@
+@@ -382,10 +383,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -92141,7 +111218,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -394,6 +399,7 @@
+@@ -394,6 +398,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -92149,7 +111226,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -555,6 +561,7 @@
+@@ -555,6 +560,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -92157,7 +111234,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -562,10 +569,12 @@
+@@ -562,10 +568,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -92170,7 +111247,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -603,7 +612,7 @@
+@@ -603,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -92179,7 +111256,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +650,9 @@
+@@ -641,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92191,6 +111268,33 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
+@@ -971,20 +979,20 @@
+ 
+ #>+ 16
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpager.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-kpager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kpager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kpager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kpager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kpager.png
+ 
+ #>+ 15
+ force-reedit:
 --- kpersonalizer/Makefile.in
 +++ kpersonalizer/Makefile.in
 @@ -173,6 +173,7 @@
@@ -92201,7 +111305,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -317,6 +318,9 @@
+@@ -267,7 +268,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -317,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92211,7 +111323,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -367,6 +371,7 @@
+@@ -367,6 +370,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -92219,7 +111331,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -374,12 +379,9 @@
+@@ -374,12 +378,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -92232,7 +111344,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -400,10 +402,13 @@
+@@ -400,10 +401,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -92246,7 +111358,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -412,6 +417,7 @@
+@@ -412,6 +416,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -92254,7 +111366,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -573,6 +579,7 @@
+@@ -573,6 +578,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -92262,7 +111374,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -580,10 +587,12 @@
+@@ -580,10 +586,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -92275,7 +111387,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -647,7 +656,7 @@
+@@ -647,7 +655,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -92284,7 +111396,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -685,9 +694,9 @@
+@@ -685,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92296,7 +111408,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1110,18 +1119,18 @@
+@@ -1110,18 +1118,18 @@
  mocs: krefinepage.moc
  
  #>+ 3
@@ -92321,7 +111433,7 @@
  
  #>+ 3
  kospage.moc: $(srcdir)/kospage.h
-@@ -1132,7 +1141,7 @@
+@@ -1132,7 +1140,7 @@
  
  #>+ 3
  clean-metasources:
@@ -92330,6 +111442,24 @@
  
  #>+ 2
  KDE_DIST=kospagedlg.ui Makefile.in uninstall.desktop stylepreview.ui stylepreview.ui.h ksysinfo.h Makefile.am 
+@@ -1152,14 +1160,14 @@
+ 
+ #>+ 10
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpersonalizer.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kpersonalizer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpersonalizer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpersonalizer.png
+ 
+ #>+ 15
+ force-reedit:
 --- kpersonalizer/pics/Makefile.in
 +++ kpersonalizer/pics/Makefile.in
 @@ -117,6 +117,7 @@
@@ -92340,7 +111470,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92350,7 +111488,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -92358,7 +111496,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -92371,7 +111509,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -92385,7 +111523,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -92393,7 +111531,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -92401,7 +111539,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -92414,7 +111552,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -92423,7 +111561,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92445,7 +111583,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -292,6 +293,9 @@
+@@ -242,7 +243,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -292,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92455,7 +111601,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -342,6 +346,7 @@
+@@ -342,6 +345,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -92463,7 +111609,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -349,12 +354,9 @@
+@@ -349,12 +353,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -92476,7 +111622,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -375,10 +377,13 @@
+@@ -375,10 +376,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -92490,7 +111636,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -387,6 +392,7 @@
+@@ -387,6 +391,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -92498,7 +111644,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -548,6 +554,7 @@
+@@ -548,6 +553,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -92506,7 +111652,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -555,10 +562,12 @@
+@@ -555,10 +561,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -92519,7 +111665,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -590,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -92528,7 +111674,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -628,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92550,7 +111696,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -303,6 +304,9 @@
+@@ -253,7 +254,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92560,7 +111714,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -92568,7 +111722,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -360,12 +365,9 @@
+@@ -360,12 +364,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -92581,7 +111735,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -386,10 +388,13 @@
+@@ -386,10 +387,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -92595,7 +111749,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -398,6 +403,7 @@
+@@ -398,6 +402,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -92603,7 +111757,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -559,6 +565,7 @@
+@@ -559,6 +564,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -92611,7 +111765,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -566,10 +573,12 @@
+@@ -566,10 +572,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -92624,7 +111778,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -608,7 +617,7 @@
+@@ -608,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -92633,7 +111787,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +655,9 @@
+@@ -646,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92655,7 +111809,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -358,6 +359,9 @@
+@@ -308,7 +309,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -358,6 +358,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92665,7 +111827,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -408,6 +412,7 @@
+@@ -408,6 +411,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -92673,7 +111835,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -415,12 +420,9 @@
+@@ -415,12 +419,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -92686,7 +111848,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -441,10 +443,13 @@
+@@ -441,10 +442,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -92700,7 +111862,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -453,6 +458,7 @@
+@@ -453,6 +457,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -92708,7 +111870,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -614,6 +620,7 @@
+@@ -614,6 +619,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -92716,7 +111878,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -621,10 +628,12 @@
+@@ -621,10 +627,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -92729,7 +111891,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -682,7 +691,7 @@
+@@ -682,7 +690,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -92738,7 +111900,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -720,9 +729,9 @@
+@@ -720,9 +728,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92760,7 +111922,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -314,6 +315,9 @@
+@@ -264,7 +265,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -314,6 +314,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92770,7 +111940,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -364,6 +368,7 @@
+@@ -364,6 +367,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -92778,7 +111948,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -371,12 +376,9 @@
+@@ -371,12 +375,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -92791,7 +111961,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -397,10 +399,13 @@
+@@ -397,10 +398,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -92805,7 +111975,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -409,6 +414,7 @@
+@@ -409,6 +413,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -92813,7 +111983,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -570,6 +576,7 @@
+@@ -570,6 +575,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -92821,7 +111991,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -577,10 +584,12 @@
+@@ -577,10 +583,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -92834,7 +112004,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -617,7 +626,7 @@
+@@ -617,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -92843,7 +112013,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +664,9 @@
+@@ -655,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92865,7 +112035,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -92875,7 +112053,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -92883,7 +112061,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -92896,7 +112074,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -92910,7 +112088,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -92918,7 +112096,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -92926,7 +112104,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -92939,7 +112117,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -543,7 +552,7 @@
+@@ -543,7 +551,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -92948,7 +112126,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +590,9 @@
+@@ -581,9 +589,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -92960,34 +112138,39 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -735,24 +744,24 @@
+@@ -733,26 +741,26 @@
+ 
+ #>+ 22
  install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/hi128-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksplash.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 -	$(INSTALL_DATA) $(srcdir)/hi22-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksplash.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/hi128-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
 +	$(INSTALL_DATA) $(srcdir)/hi22-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi64-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-ksplash.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
  
  uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ksplash.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksplash.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ksplash.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ksplash.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ksplash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksplash.png
  
  #>+ 15
  force-reedit:
@@ -93001,7 +112184,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -316,6 +317,9 @@
+@@ -266,7 +267,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -316,6 +316,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93011,7 +112202,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -366,6 +370,7 @@
+@@ -366,6 +369,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -93019,7 +112210,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -373,12 +378,9 @@
+@@ -373,12 +377,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -93032,7 +112223,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -399,10 +401,13 @@
+@@ -399,10 +400,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -93046,7 +112237,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -411,6 +416,7 @@
+@@ -411,6 +415,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -93054,7 +112245,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -572,6 +578,7 @@
+@@ -572,6 +577,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -93062,7 +112253,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -579,10 +586,12 @@
+@@ -579,10 +585,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -93075,7 +112266,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -619,7 +628,7 @@
+@@ -619,7 +627,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -93084,7 +112275,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +666,9 @@
+@@ -657,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93106,7 +112297,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -277,6 +278,9 @@
+@@ -227,7 +228,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93116,7 +112315,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,6 +331,7 @@
+@@ -327,6 +330,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -93124,7 +112323,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -334,12 +339,9 @@
+@@ -334,12 +338,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -93137,7 +112336,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,10 +362,13 @@
+@@ -360,10 +361,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -93151,7 +112350,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -372,6 +377,7 @@
+@@ -372,6 +376,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -93159,7 +112358,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -533,6 +539,7 @@
+@@ -533,6 +538,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -93167,7 +112366,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -540,10 +547,12 @@
+@@ -540,10 +546,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -93180,7 +112379,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -572,7 +580,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -93189,7 +112388,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -610,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93211,7 +112410,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93221,7 +112428,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -93229,7 +112436,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -93242,7 +112449,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -93256,7 +112463,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -93264,7 +112471,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -93272,7 +112479,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -93285,7 +112492,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -93294,7 +112501,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93316,7 +112523,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93326,7 +112541,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -93334,7 +112549,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -93347,7 +112562,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -93361,7 +112576,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -93369,7 +112584,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -93377,7 +112592,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -93390,7 +112605,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -93399,7 +112614,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93421,7 +112636,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -277,6 +278,9 @@
+@@ -227,7 +228,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93431,7 +112654,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -327,6 +331,7 @@
+@@ -327,6 +330,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -93439,7 +112662,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -334,12 +339,9 @@
+@@ -334,12 +338,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -93452,7 +112675,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -360,10 +362,13 @@
+@@ -360,10 +361,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -93466,7 +112689,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -372,6 +377,7 @@
+@@ -372,6 +376,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -93474,7 +112697,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -533,6 +539,7 @@
+@@ -533,6 +538,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -93482,7 +112705,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -540,10 +547,12 @@
+@@ -540,10 +546,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -93495,7 +112718,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -572,7 +580,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -93504,7 +112727,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -610,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93526,7 +112749,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93536,7 +112767,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -93544,7 +112775,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -93557,7 +112788,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -93571,7 +112802,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -93579,7 +112810,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -93587,7 +112818,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -93600,14 +112831,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,13 +564,13 @@
- xdg_menudir = @xdg_menudir@
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. none default simple blue-bend
-+SUBDIRS =. default none blue-bend simple
- #>- all: all-recursive
- #>+ 1
+@@ -561,7 +569,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -93616,7 +112840,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +608,9 @@
+@@ -599,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93638,7 +112862,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93648,7 +112880,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -93656,7 +112888,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -93669,7 +112901,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -93683,7 +112915,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -93691,7 +112923,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -93699,7 +112931,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -93712,7 +112944,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -93721,7 +112953,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93743,7 +112975,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93753,7 +112993,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -93761,7 +113001,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -93774,7 +113014,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -93788,7 +113028,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -93796,7 +113036,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -93804,7 +113044,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -93817,7 +113057,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -93826,7 +113066,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93848,7 +113088,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93858,7 +113106,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -93866,7 +113114,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -93879,7 +113127,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -93893,7 +113141,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -93901,7 +113149,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -93909,7 +113157,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -93922,7 +113170,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -606,7 +615,7 @@
+@@ -606,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -93931,7 +113179,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +653,9 @@
+@@ -644,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -93953,7 +113201,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -318,6 +319,9 @@
+@@ -268,7 +269,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -318,6 +318,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -93963,7 +113219,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -368,6 +372,7 @@
+@@ -368,6 +371,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -93971,7 +113227,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -375,12 +380,9 @@
+@@ -375,12 +379,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -93984,7 +113240,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -401,10 +403,13 @@
+@@ -401,10 +402,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -93998,7 +113254,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -413,6 +418,7 @@
+@@ -413,6 +417,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -94006,7 +113262,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -574,6 +580,7 @@
+@@ -574,6 +579,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -94014,7 +113270,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -581,10 +588,12 @@
+@@ -581,10 +587,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -94027,7 +113283,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -622,7 +631,7 @@
+@@ -622,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -94036,7 +113292,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +669,9 @@
+@@ -660,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94058,7 +113314,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -316,6 +317,9 @@
+@@ -266,7 +267,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -316,6 +316,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94068,7 +113332,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -366,6 +370,7 @@
+@@ -366,6 +369,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -94076,7 +113340,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -373,12 +378,9 @@
+@@ -373,12 +377,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -94089,7 +113353,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -399,10 +401,13 @@
+@@ -399,10 +400,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -94103,7 +113367,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -411,6 +416,7 @@
+@@ -411,6 +415,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -94111,7 +113375,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -572,6 +578,7 @@
+@@ -572,6 +577,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -94119,7 +113383,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -579,10 +586,12 @@
+@@ -579,10 +585,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -94132,7 +113396,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -620,7 +629,7 @@
+@@ -620,7 +628,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -94141,7 +113405,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +667,9 @@
+@@ -658,9 +666,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94163,7 +113427,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94173,7 +113445,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -94181,7 +113453,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -94194,7 +113466,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -94208,7 +113480,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -94216,7 +113488,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -94224,7 +113496,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -94237,7 +113509,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -94246,7 +113518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94268,7 +113540,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -286,6 +287,9 @@
+@@ -236,7 +237,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94278,7 +113558,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,6 +340,7 @@
+@@ -336,6 +339,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -94286,7 +113566,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -343,12 +348,9 @@
+@@ -343,12 +347,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -94299,7 +113579,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,10 +371,13 @@
+@@ -369,10 +370,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -94313,7 +113593,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -381,6 +386,7 @@
+@@ -381,6 +385,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -94321,7 +113601,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -542,6 +548,7 @@
+@@ -542,6 +547,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -94329,7 +113609,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -549,10 +556,12 @@
+@@ -549,10 +555,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -94342,7 +113622,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -582,7 +591,7 @@
+@@ -582,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -94351,7 +113631,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +629,9 @@
+@@ -620,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94373,7 +113653,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -325,6 +326,9 @@
+@@ -275,7 +276,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -325,6 +325,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94383,7 +113671,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -375,6 +379,7 @@
+@@ -375,6 +378,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -94391,7 +113679,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -382,12 +387,9 @@
+@@ -382,12 +386,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -94404,7 +113692,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -408,10 +410,13 @@
+@@ -408,10 +409,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -94418,7 +113706,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -420,6 +425,7 @@
+@@ -420,6 +424,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -94426,7 +113714,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -581,6 +587,7 @@
+@@ -581,6 +586,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -94434,7 +113722,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -588,10 +595,12 @@
+@@ -588,10 +594,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -94447,7 +113735,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -633,7 +642,7 @@
+@@ -633,7 +641,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -94456,7 +113744,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -671,9 +680,9 @@
+@@ -671,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94478,7 +113766,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94488,7 +113784,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -94496,7 +113792,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -94509,7 +113805,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -94523,7 +113819,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -94531,7 +113827,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -94539,7 +113835,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -94552,7 +113848,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -555,7 +564,7 @@
+@@ -555,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -94561,7 +113857,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +602,9 @@
+@@ -593,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94583,7 +113879,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -290,6 +291,9 @@
+@@ -240,7 +241,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94593,7 +113897,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -340,6 +344,7 @@
+@@ -340,6 +343,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -94601,7 +113905,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -347,12 +352,9 @@
+@@ -347,12 +351,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -94614,7 +113918,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -373,10 +375,13 @@
+@@ -373,10 +374,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -94628,7 +113932,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -385,6 +390,7 @@
+@@ -385,6 +389,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -94636,7 +113940,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -546,6 +552,7 @@
+@@ -546,6 +551,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -94644,7 +113948,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -553,10 +560,12 @@
+@@ -553,10 +559,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -94657,7 +113961,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -590,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -94666,7 +113970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -628,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94688,7 +113992,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -276,6 +277,9 @@
+@@ -226,7 +227,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -276,6 +276,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94698,7 +114010,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -326,6 +330,7 @@
+@@ -326,6 +329,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -94706,7 +114018,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -333,12 +338,9 @@
+@@ -333,12 +337,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -94719,7 +114031,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -359,10 +361,13 @@
+@@ -359,10 +360,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -94733,7 +114045,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -371,6 +376,7 @@
+@@ -371,6 +375,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -94741,7 +114053,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -532,6 +538,7 @@
+@@ -532,6 +537,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -94749,7 +114061,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -539,10 +546,12 @@
+@@ -539,10 +545,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -94762,7 +114074,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -572,7 +580,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -94771,7 +114083,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -610,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94793,7 +114105,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -263,6 +264,9 @@
+@@ -213,7 +214,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94803,7 +114123,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -313,6 +317,7 @@
+@@ -313,6 +316,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -94811,7 +114131,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -320,12 +325,9 @@
+@@ -320,12 +324,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -94824,7 +114144,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -346,10 +348,13 @@
+@@ -346,10 +347,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -94838,7 +114158,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -358,6 +363,7 @@
+@@ -358,6 +362,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -94846,7 +114166,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -519,6 +525,7 @@
+@@ -519,6 +524,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -94854,7 +114174,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -526,10 +533,12 @@
+@@ -526,10 +532,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -94867,7 +114187,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -94876,7 +114196,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94898,7 +114218,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -301,6 +302,9 @@
+@@ -251,7 +252,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -94908,7 +114236,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,6 +355,7 @@
+@@ -351,6 +354,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -94916,7 +114244,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -358,12 +363,9 @@
+@@ -358,12 +362,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -94929,7 +114257,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -384,10 +386,13 @@
+@@ -384,10 +385,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -94943,7 +114271,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -396,6 +401,7 @@
+@@ -396,6 +400,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -94951,7 +114279,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -557,6 +563,7 @@
+@@ -557,6 +562,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -94959,7 +114287,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -564,10 +571,12 @@
+@@ -564,10 +570,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -94972,7 +114300,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -628,7 +637,7 @@
+@@ -628,7 +636,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -94981,7 +114309,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +675,9 @@
+@@ -666,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -94993,35 +114321,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -957,6 +966,27 @@
- 
- 
- #>+ 3
-+StyleSettings.moc: $(srcdir)/StyleSettings.h
-+	$(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
-+
-+#>+ 2
-+mocs: StyleSettings.moc
-+
-+#>+ 3
-+HostConnector.moc: $(srcdir)/HostConnector.h
-+	$(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
-+
-+#>+ 2
-+mocs: HostConnector.moc
-+
-+#>+ 3
-+SensorAgent.moc: $(srcdir)/SensorAgent.h
-+	$(MOC) $(srcdir)/SensorAgent.h -o SensorAgent.moc
-+
-+#>+ 2
-+mocs: SensorAgent.moc
-+
-+#>+ 3
- TimerSettings.moc: $(srcdir)/TimerSettings.h
- 	$(MOC) $(srcdir)/TimerSettings.h -o TimerSettings.moc
- 
-@@ -971,13 +1001,6 @@
+@@ -971,13 +979,6 @@
  mocs: SensorSocketAgent.moc
  
  #>+ 3
@@ -95035,56 +114335,53 @@
  SensorManager.moc: $(srcdir)/SensorManager.h
  	$(MOC) $(srcdir)/SensorManager.h -o SensorManager.moc
  
-@@ -999,22 +1022,8 @@
+@@ -985,11 +986,11 @@
+ mocs: SensorManager.moc
+ 
+ #>+ 3
+-StyleEngine.moc: $(srcdir)/StyleEngine.h
+-	$(MOC) $(srcdir)/StyleEngine.h -o StyleEngine.moc
++StyleSettings.moc: $(srcdir)/StyleSettings.h
++	$(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
+ 
+ #>+ 2
+-mocs: StyleEngine.moc
++mocs: StyleSettings.moc
+ 
+ #>+ 3
+ SensorShellAgent.moc: $(srcdir)/SensorShellAgent.h
+@@ -999,6 +1000,13 @@
  mocs: SensorShellAgent.moc
  
  #>+ 3
--HostConnector.moc: $(srcdir)/HostConnector.h
--	$(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
--
--#>+ 2
--mocs: HostConnector.moc
--
--#>+ 3
--SensorAgent.moc: $(srcdir)/SensorAgent.h
--	$(MOC) $(srcdir)/SensorAgent.h -o SensorAgent.moc
--
--#>+ 2
--mocs: SensorAgent.moc
--
--#>+ 3
++StyleEngine.moc: $(srcdir)/StyleEngine.h
++	$(MOC) $(srcdir)/StyleEngine.h -o StyleEngine.moc
++
++#>+ 2
++mocs: StyleEngine.moc
++
++#>+ 3
+ HostConnector.moc: $(srcdir)/HostConnector.h
+ 	$(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
+ 
+@@ -1014,7 +1022,7 @@
+ 
+ #>+ 3
  clean-metasources:
 -	-rm -f  TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.moc
-+	-rm -f  StyleSettings.moc HostConnector.moc SensorAgent.moc TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc
++	-rm -f  TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleSettings.moc SensorShellAgent.moc StyleEngine.moc HostConnector.moc SensorAgent.moc
  
  #>+ 2
  KDE_DIST=Makefile.in Makefile.am 
-@@ -1065,7 +1074,7 @@
+@@ -1065,7 +1073,7 @@
  
  
  #>+ 11
 -libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc  TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleSettings.moc SensorShellAgent.moc StyleEngine.moc HostConnector.moc SensorAgent.moc
-+libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc  StyleSettings.moc HostConnector.moc SensorAgent.moc TimerSettings.moc SensorSocketAgent.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc
++libksgrd_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/HostConnector.cc $(srcdir)/SensorAgent.cc $(srcdir)/SensorManager.cc $(srcdir)/SensorShellAgent.cc $(srcdir)/SensorSocketAgent.cc $(srcdir)/StyleEngine.cc $(srcdir)/StyleSettings.cc $(srcdir)/TimerSettings.cc  TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.moc
  	@echo 'creating libksgrd_la.all_cc.cc ...'; \
  	rm -f libksgrd_la.all_cc.files libksgrd_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libksgrd_la.all_cc.final; \
-@@ -1107,14 +1116,14 @@
- StyleEngine.o: StyleEngine.moc 
- SensorSocketAgent.lo: SensorSocketAgent.moc 
- TimerSettings.lo: TimerSettings.moc 
--SensorAgent.o: SensorAgent.moc 
- SensorShellAgent.lo: SensorShellAgent.moc 
-+SensorAgent.o: SensorAgent.moc 
- SensorAgent.lo: SensorAgent.moc 
- nmcheck: 
- SensorManager.o: SensorManager.moc 
- StyleEngine.lo: StyleEngine.moc 
--TimerSettings.o: TimerSettings.moc 
- StyleSettings.o: StyleSettings.moc 
-+TimerSettings.o: TimerSettings.moc 
- SensorManager.lo: SensorManager.moc 
- nmcheck-am: nmcheck
- HostConnector.lo: HostConnector.moc 
 --- ksysguard/gui/Makefile.in
 +++ ksysguard/gui/Makefile.in
 @@ -212,6 +212,7 @@
@@ -95095,7 +114392,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -356,6 +357,9 @@
+@@ -306,7 +307,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -356,6 +356,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95105,7 +114410,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -406,6 +410,7 @@
+@@ -406,6 +409,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -95113,7 +114418,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -413,12 +418,9 @@
+@@ -413,12 +417,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -95126,7 +114431,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -439,10 +441,13 @@
+@@ -439,10 +440,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -95140,7 +114445,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -451,6 +456,7 @@
+@@ -451,6 +455,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -95148,7 +114453,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -612,6 +618,7 @@
+@@ -612,6 +617,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -95156,7 +114461,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -619,10 +626,12 @@
+@@ -619,10 +625,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -95169,7 +114474,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -703,7 +712,7 @@
+@@ -703,7 +711,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -95178,7 +114483,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -741,9 +750,9 @@
+@@ -741,9 +749,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95200,7 +114505,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -296,6 +297,9 @@
+@@ -246,7 +247,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95210,7 +114523,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,6 +350,7 @@
+@@ -346,6 +349,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -95218,7 +114531,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -353,12 +358,9 @@
+@@ -353,12 +357,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -95231,7 +114544,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,10 +381,13 @@
+@@ -379,10 +380,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -95245,7 +114558,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -391,6 +396,7 @@
+@@ -391,6 +395,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -95253,7 +114566,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -552,6 +558,7 @@
+@@ -552,6 +557,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -95261,7 +114574,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -559,10 +566,12 @@
+@@ -559,10 +565,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -95274,7 +114587,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -653,7 +662,7 @@
+@@ -653,7 +661,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -95283,7 +114596,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -691,9 +700,9 @@
+@@ -691,9 +699,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95295,32 +114608,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -973,18 +982,18 @@
- mocs: DummyDisplay.moc
+@@ -952,18 +960,18 @@
  
+ 
  #>+ 3
--FancyPlotterSettings.moc: $(srcdir)/FancyPlotterSettings.h
--	$(MOC) $(srcdir)/FancyPlotterSettings.h -o FancyPlotterSettings.moc
-+SensorLoggerDlg.moc: $(srcdir)/SensorLoggerDlg.h
-+	$(MOC) $(srcdir)/SensorLoggerDlg.h -o SensorLoggerDlg.moc
+-ListViewSettings.moc: $(srcdir)/ListViewSettings.h
+-	$(MOC) $(srcdir)/ListViewSettings.h -o ListViewSettings.moc
++SensorDisplay.moc: $(srcdir)/SensorDisplay.h
++	$(MOC) $(srcdir)/SensorDisplay.h -o SensorDisplay.moc
  
  #>+ 2
--mocs: FancyPlotterSettings.moc
-+mocs: SensorLoggerDlg.moc
+-mocs: ListViewSettings.moc
++mocs: SensorDisplay.moc
  
  #>+ 3
--SensorLoggerDlg.moc: $(srcdir)/SensorLoggerDlg.h
--	$(MOC) $(srcdir)/SensorLoggerDlg.h -o SensorLoggerDlg.moc
-+FancyPlotterSettings.moc: $(srcdir)/FancyPlotterSettings.h
-+	$(MOC) $(srcdir)/FancyPlotterSettings.h -o FancyPlotterSettings.moc
+-SensorDisplay.moc: $(srcdir)/SensorDisplay.h
+-	$(MOC) $(srcdir)/SensorDisplay.h -o SensorDisplay.moc
++ListViewSettings.moc: $(srcdir)/ListViewSettings.h
++	$(MOC) $(srcdir)/ListViewSettings.h -o ListViewSettings.moc
  
  #>+ 2
--mocs: SensorLoggerDlg.moc
-+mocs: FancyPlotterSettings.moc
+-mocs: SensorDisplay.moc
++mocs: ListViewSettings.moc
  
  #>+ 3
- LogFile.moc: $(srcdir)/LogFile.h
-@@ -1015,18 +1024,18 @@
+ DummyDisplay.moc: $(srcdir)/DummyDisplay.h
+@@ -1015,18 +1023,18 @@
  mocs: ListView.moc
  
  #>+ 3
@@ -95345,21 +114658,21 @@
  
  #>+ 3
  DancingBarsSettings.moc: $(srcdir)/DancingBarsSettings.h
-@@ -1086,7 +1095,7 @@
+@@ -1086,7 +1094,7 @@
  
  #>+ 3
  clean-metasources:
 -	-rm -f  ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc ReniceDlg.moc SensorLogger.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
-+	-rm -f  ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
++	-rm -f  SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
  
  #>+ 2
  KDE_DIST=SignalPlotter.h LogFile.h SensorLoggerSettings.h SensorLoggerSettingsWidget.ui FancyPlotter.h SensorLoggerDlgWidget.ui.h Makefile.in DancingBarsSettings.h BarGraph.h MultiMeterSettingsWidget.ui MultiMeter.h ListViewSettingsWidget.ui.h ProcessList.h SensorDisplay.h SensorLoggerSettingsWidget.ui.h DummyDisplay.h ReniceDlg.h DancingBars.h MultiMeterSettings.h SensorLoggerDlgWidget.ui ListView.h ListViewSettingsWidget.ui SensorLoggerDlg.h FancyPlotterSettings.h SensorLogger.h MultiMeterSettingsWidget.ui.h ProcessController.h ListViewSettings.h Makefile.am LogFileSettings.ui 
-@@ -1146,7 +1155,7 @@
+@@ -1146,7 +1154,7 @@
  
  
  #>+ 11
 -libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc  SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc ReniceDlg.moc SensorLogger.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
-+libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc  SensorDisplay.moc ListViewSettings.moc DummyDisplay.moc FancyPlotterSettings.moc SensorLoggerDlg.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
++libsensordisplays_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/SensorDisplay.cc $(srcdir)/BarGraph.cc $(srcdir)/DancingBars.cc $(srcdir)/DancingBarsSettings.cc $(srcdir)/DummyDisplay.cc $(srcdir)/FancyPlotter.cc $(srcdir)/FancyPlotterSettings.cc $(srcdir)/ListView.cc $(srcdir)/LogFile.cc $(srcdir)/MultiMeter.cc $(srcdir)/MultiMeterSettings.cc $(srcdir)/ProcessController.cc $(srcdir)/ProcessList.cc $(srcdir)/ReniceDlg.cc $(srcdir)/SensorLogger.cc $(srcdir)/SensorLoggerDlg.cc $(srcdir)/SensorLoggerSettings.cc $(srcdir)/ListViewSettings.cc $(srcdir)/SignalPlotter.cc ListViewSettingsWidget.cc LogFileSettings.cc MultiMeterSettingsWidget.cc SensorLoggerDlgWidget.cc SensorLoggerSettingsWidget.cc  ListViewSettings.moc SensorDisplay.moc DummyDisplay.moc SensorLoggerDlg.moc FancyPlotterSettings.moc LogFile.moc ProcessController.moc SignalPlotter.moc ListView.moc SensorLogger.moc ReniceDlg.moc DancingBarsSettings.moc SensorLoggerSettings.moc FancyPlotter.moc MultiMeterSettings.moc BarGraph.moc DancingBars.moc MultiMeter.moc ProcessList.moc
  	@echo 'creating libsensordisplays_la.all_cc.cc ...'; \
  	rm -f libsensordisplays_la.all_cc.files libsensordisplays_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libsensordisplays_la.all_cc.final; \
@@ -95373,7 +114686,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -283,6 +284,9 @@
+@@ -233,7 +234,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95383,7 +114704,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -333,6 +337,7 @@
+@@ -333,6 +336,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -95391,7 +114712,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -340,12 +345,9 @@
+@@ -340,12 +344,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -95404,7 +114725,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -366,10 +368,13 @@
+@@ -366,10 +367,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -95418,7 +114739,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -378,6 +383,7 @@
+@@ -378,6 +382,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -95426,7 +114747,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -539,6 +545,7 @@
+@@ -539,6 +544,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -95434,7 +114755,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -546,10 +553,12 @@
+@@ -546,10 +552,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -95447,7 +114768,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -580,7 +589,7 @@
+@@ -580,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -95456,7 +114777,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +627,9 @@
+@@ -618,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95478,7 +114799,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -278,6 +279,9 @@
+@@ -228,7 +229,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -278,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95488,7 +114817,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -328,6 +332,7 @@
+@@ -328,6 +331,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -95496,7 +114825,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -335,12 +340,9 @@
+@@ -335,12 +339,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -95509,7 +114838,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -361,10 +363,13 @@
+@@ -361,10 +362,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -95523,7 +114852,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -373,6 +378,7 @@
+@@ -373,6 +377,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -95531,7 +114860,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -534,6 +540,7 @@
+@@ -534,6 +539,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -95539,7 +114868,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -541,10 +548,12 @@
+@@ -541,10 +547,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -95552,7 +114881,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -573,7 +582,7 @@
+@@ -573,7 +581,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -95561,7 +114890,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -611,9 +620,9 @@
+@@ -611,9 +619,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95583,7 +114912,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -284,6 +285,9 @@
+@@ -234,7 +235,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95593,7 +114930,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -334,6 +338,7 @@
+@@ -334,6 +337,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -95601,7 +114938,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -341,12 +346,9 @@
+@@ -341,12 +345,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -95614,7 +114951,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,10 +369,13 @@
+@@ -367,10 +368,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -95628,7 +114965,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -379,6 +384,7 @@
+@@ -379,6 +383,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -95636,7 +114973,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -540,6 +546,7 @@
+@@ -540,6 +545,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -95644,7 +114981,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -547,10 +554,12 @@
+@@ -547,10 +553,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -95657,7 +114994,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -586,7 +595,7 @@
+@@ -586,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -95666,7 +115003,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +633,9 @@
+@@ -624,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95688,7 +115025,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95698,7 +115043,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -95706,7 +115051,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -95719,7 +115064,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -95733,7 +115078,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -95741,7 +115086,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -95749,7 +115094,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -95762,7 +115107,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -605,7 +614,7 @@
+@@ -605,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -95771,7 +115116,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +652,9 @@
+@@ -643,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95793,7 +115138,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -283,6 +284,9 @@
+@@ -233,7 +234,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95803,7 +115156,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -333,6 +337,7 @@
+@@ -333,6 +336,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -95811,7 +115164,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -340,12 +345,9 @@
+@@ -340,12 +344,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -95824,7 +115177,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -366,10 +368,13 @@
+@@ -366,10 +367,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -95838,7 +115191,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -378,6 +383,7 @@
+@@ -378,6 +382,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -95846,7 +115199,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -539,6 +545,7 @@
+@@ -539,6 +544,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -95854,7 +115207,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -546,10 +553,12 @@
+@@ -546,10 +552,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -95867,7 +115220,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -580,7 +589,7 @@
+@@ -580,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -95876,7 +115229,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +627,9 @@
+@@ -618,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -95898,7 +115251,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -276,6 +277,9 @@
+@@ -226,7 +227,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -276,6 +276,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -95908,7 +115269,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -326,6 +330,7 @@
+@@ -326,6 +329,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -95916,7 +115277,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -333,12 +338,9 @@
+@@ -333,12 +337,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -95929,7 +115290,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -359,10 +361,13 @@
+@@ -359,10 +360,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -95943,7 +115304,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -371,6 +376,7 @@
+@@ -371,6 +375,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -95951,7 +115312,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -532,6 +538,7 @@
+@@ -532,6 +537,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -95959,7 +115320,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -539,10 +546,12 @@
+@@ -539,10 +545,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -95972,7 +115333,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -572,7 +581,7 @@
+@@ -572,7 +580,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -95981,7 +115342,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +619,9 @@
+@@ -610,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96003,7 +115364,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -284,6 +285,9 @@
+@@ -234,7 +235,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96013,7 +115382,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -334,6 +338,7 @@
+@@ -334,6 +337,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -96021,7 +115390,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -341,12 +346,9 @@
+@@ -341,12 +345,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -96034,7 +115403,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,10 +369,13 @@
+@@ -367,10 +368,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -96048,7 +115417,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -379,6 +384,7 @@
+@@ -379,6 +383,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -96056,7 +115425,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -540,6 +546,7 @@
+@@ -540,6 +545,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -96064,7 +115433,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -547,10 +554,12 @@
+@@ -547,10 +553,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -96077,7 +115446,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -579,7 +588,7 @@
+@@ -579,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -96086,7 +115455,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +626,9 @@
+@@ -617,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96108,7 +115477,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -286,6 +287,9 @@
+@@ -236,7 +237,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96118,7 +115495,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -336,6 +340,7 @@
+@@ -336,6 +339,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -96126,7 +115503,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -343,12 +348,9 @@
+@@ -343,12 +347,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -96139,7 +115516,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -369,10 +371,13 @@
+@@ -369,10 +370,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -96153,7 +115530,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -381,6 +386,7 @@
+@@ -381,6 +385,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -96161,7 +115538,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -542,6 +548,7 @@
+@@ -542,6 +547,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -96169,7 +115546,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -549,10 +556,12 @@
+@@ -549,10 +555,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -96182,7 +115559,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -585,7 +594,7 @@
+@@ -585,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -96191,7 +115568,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +632,9 @@
+@@ -623,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96213,7 +115590,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96223,7 +115608,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -96231,7 +115616,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -96244,7 +115629,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -96258,7 +115643,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -96266,7 +115651,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -96274,7 +115659,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -96287,7 +115672,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -563,7 +572,7 @@
+@@ -563,7 +571,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -96296,7 +115681,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +610,9 @@
+@@ -601,9 +609,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96308,7 +115693,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -901,23 +910,23 @@
+@@ -901,23 +909,23 @@
  
  #>+ 19
  install-kde-icons:
@@ -96320,24 +115705,24 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
  	$(INSTALL_DATA) $(srcdir)/cr128-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksysguard.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/cr48-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysguard.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
 +	$(INSTALL_DATA) $(srcdir)/cr32-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-ksysguard.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ksysguard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksysguard.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksysguard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksysguard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/ksysguard.png
  
  #>+ 15
  force-reedit:
@@ -96351,7 +115736,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96361,7 +115754,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -96369,7 +115762,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -96382,7 +115775,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -96396,7 +115789,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -96404,7 +115797,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -96412,7 +115805,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -96425,7 +115818,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -96434,7 +115827,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96456,7 +115849,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -294,6 +295,9 @@
+@@ -244,7 +245,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96466,7 +115867,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,6 +348,7 @@
+@@ -344,6 +347,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -96474,7 +115875,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -351,12 +356,9 @@
+@@ -351,12 +355,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -96487,7 +115888,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,10 +379,13 @@
+@@ -377,10 +378,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -96501,7 +115902,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -389,6 +394,7 @@
+@@ -389,6 +393,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -96509,7 +115910,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -550,6 +556,7 @@
+@@ -550,6 +555,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -96517,7 +115918,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -557,10 +564,12 @@
+@@ -557,10 +563,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -96530,7 +115931,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -592,7 +601,7 @@
+@@ -592,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -96539,7 +115940,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +639,9 @@
+@@ -630,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96561,7 +115962,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -311,6 +312,9 @@
+@@ -261,7 +262,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96571,7 +115980,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -361,6 +365,7 @@
+@@ -361,6 +364,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -96579,7 +115988,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -368,12 +373,9 @@
+@@ -368,12 +372,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -96592,7 +116001,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -394,10 +396,13 @@
+@@ -394,10 +395,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -96606,7 +116015,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -406,6 +411,7 @@
+@@ -406,6 +410,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -96614,7 +116023,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -567,6 +573,7 @@
+@@ -567,6 +572,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -96622,7 +116031,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -574,10 +581,12 @@
+@@ -574,10 +580,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -96635,7 +116044,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -615,7 +624,7 @@
+@@ -615,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -96644,7 +116053,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -653,9 +662,9 @@
+@@ -653,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96656,48 +116065,41 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1081,7 +1090,7 @@
- .NOEXPORT:
+@@ -1088,29 +1096,29 @@
  
- #>+ 2
--KDE_DIST=hi48-app-ktip.png hi64-app-ktip.png Makefile.in uninstall.desktop hisc-app-ktip.svgz hi22-app-ktip.png hi32-app-ktip.png hi16-app-ktip.png hi128-app-ktip.png ktip.desktop tips Makefile.am 
-+KDE_DIST=hi48-app-ktip.png hi64-app-ktip.png Makefile.in uninstall.desktop hisc-app-ktip.svgz hi22-app-ktip.png hi32-app-ktip.png hi128-app-ktip.png hi16-app-ktip.png ktip.desktop tips Makefile.am 
- 
- #>+ 2
- docs-am:
-@@ -1090,27 +1099,27 @@
+ #>+ 25
  install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/hi64-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi128-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/hisc-app-ktip.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
  	$(INSTALL_DATA) $(srcdir)/hi22-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ktip.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/hi64-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/hi32-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktip.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-ktip.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
 +	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
 +	$(INSTALL_DATA) $(srcdir)/hisc-app-ktip.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
  
  uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ktip.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktip.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ktip.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktip.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktip.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktip.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ktip.svgz
  
  #>+ 15
@@ -96712,7 +116114,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96722,7 +116132,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -96730,7 +116140,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -96743,7 +116153,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -96757,7 +116167,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -96765,7 +116175,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -96773,7 +116183,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -96786,7 +116196,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -96795,7 +116205,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96817,7 +116227,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -293,6 +294,9 @@
+@@ -243,7 +244,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96827,7 +116245,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,6 +347,7 @@
+@@ -343,6 +346,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -96835,7 +116253,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -350,12 +355,9 @@
+@@ -350,12 +354,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -96848,7 +116266,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -376,10 +378,13 @@
+@@ -376,10 +377,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -96862,7 +116280,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -388,6 +393,7 @@
+@@ -388,6 +392,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -96870,7 +116288,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -549,6 +555,7 @@
+@@ -549,6 +554,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -96878,7 +116296,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -556,10 +563,12 @@
+@@ -556,10 +562,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -96891,7 +116309,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -593,7 +602,7 @@
+@@ -593,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -96900,7 +116318,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +640,9 @@
+@@ -631,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -96922,7 +116340,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -309,6 +310,9 @@
+@@ -259,7 +260,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -96932,7 +116358,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -359,6 +363,7 @@
+@@ -359,6 +362,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -96940,7 +116366,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -366,12 +371,9 @@
+@@ -366,12 +370,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -96953,7 +116379,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,10 +394,13 @@
+@@ -392,10 +393,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -96967,7 +116393,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -404,6 +409,7 @@
+@@ -404,6 +408,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -96975,7 +116401,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -565,6 +571,7 @@
+@@ -565,6 +570,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -96983,7 +116409,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -572,10 +579,12 @@
+@@ -572,10 +578,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -96996,7 +116422,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -613,7 +622,7 @@
+@@ -613,7 +621,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -97005,7 +116431,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +660,9 @@
+@@ -651,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97027,7 +116453,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -293,6 +294,9 @@
+@@ -243,7 +244,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97037,7 +116471,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,6 +347,7 @@
+@@ -343,6 +346,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -97045,7 +116479,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -350,12 +355,9 @@
+@@ -350,12 +354,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -97058,7 +116492,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -376,10 +378,13 @@
+@@ -376,10 +377,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -97072,7 +116506,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -388,6 +393,7 @@
+@@ -388,6 +392,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -97080,7 +116514,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -549,6 +555,7 @@
+@@ -549,6 +554,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -97088,7 +116522,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -556,10 +563,12 @@
+@@ -556,10 +562,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -97101,7 +116535,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -593,7 +602,7 @@
+@@ -593,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -97110,7 +116544,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +640,9 @@
+@@ -631,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97132,7 +116566,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -308,6 +309,9 @@
+@@ -258,7 +259,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -308,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97142,7 +116584,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -358,6 +362,7 @@
+@@ -358,6 +361,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -97150,7 +116592,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -365,12 +370,9 @@
+@@ -365,12 +369,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -97163,7 +116605,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -391,10 +393,13 @@
+@@ -391,10 +392,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -97177,7 +116619,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -403,6 +408,7 @@
+@@ -403,6 +407,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -97185,7 +116627,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -564,6 +570,7 @@
+@@ -564,6 +569,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -97193,7 +116635,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -571,10 +578,12 @@
+@@ -571,10 +577,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -97206,7 +116648,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -608,7 +617,7 @@
+@@ -608,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -97215,7 +116657,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +655,9 @@
+@@ -646,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97237,7 +116679,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -296,6 +297,9 @@
+@@ -246,7 +247,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97247,7 +116697,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,6 +350,7 @@
+@@ -346,6 +349,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -97255,7 +116705,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -353,12 +358,9 @@
+@@ -353,12 +357,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -97268,7 +116718,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,10 +381,13 @@
+@@ -379,10 +380,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -97282,7 +116732,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -391,6 +396,7 @@
+@@ -391,6 +395,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -97290,7 +116740,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -552,6 +558,7 @@
+@@ -552,6 +557,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -97298,7 +116748,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -559,10 +566,12 @@
+@@ -559,10 +565,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -97311,7 +116761,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -598,7 +607,7 @@
+@@ -598,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -97320,7 +116770,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +645,9 @@
+@@ -636,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97342,7 +116792,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -319,6 +320,9 @@
+@@ -269,7 +270,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -319,6 +319,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97352,7 +116810,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -369,6 +373,7 @@
+@@ -369,6 +372,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -97360,7 +116818,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -376,12 +381,9 @@
+@@ -376,12 +380,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -97373,7 +116831,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -402,10 +404,13 @@
+@@ -402,10 +403,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -97387,7 +116845,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -414,6 +419,7 @@
+@@ -414,6 +418,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -97395,7 +116853,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -575,6 +581,7 @@
+@@ -575,6 +580,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -97403,7 +116861,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -582,10 +589,12 @@
+@@ -582,10 +588,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -97416,7 +116874,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -628,7 +637,7 @@
+@@ -628,7 +636,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -97425,7 +116883,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +675,9 @@
+@@ -666,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97447,7 +116905,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -285,6 +286,9 @@
+@@ -235,7 +236,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97457,7 +116923,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -335,6 +339,7 @@
+@@ -335,6 +338,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -97465,7 +116931,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -342,12 +347,9 @@
+@@ -342,12 +346,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -97478,7 +116944,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -368,10 +370,13 @@
+@@ -368,10 +369,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -97492,7 +116958,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -380,6 +385,7 @@
+@@ -380,6 +384,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -97500,7 +116966,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -541,6 +547,7 @@
+@@ -541,6 +546,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -97508,7 +116974,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -548,10 +555,12 @@
+@@ -548,10 +554,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -97521,7 +116987,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -590,7 +599,7 @@
+@@ -590,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -97530,7 +116996,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +637,9 @@
+@@ -628,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97552,7 +117018,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -309,6 +310,9 @@
+@@ -259,7 +260,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97562,7 +117036,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -359,6 +363,7 @@
+@@ -359,6 +362,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -97570,7 +117044,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -366,12 +371,9 @@
+@@ -366,12 +370,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -97583,7 +117057,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,10 +394,13 @@
+@@ -392,10 +393,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -97597,7 +117071,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -404,6 +409,7 @@
+@@ -404,6 +408,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -97605,7 +117079,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -565,6 +571,7 @@
+@@ -565,6 +570,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -97613,7 +117087,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -572,10 +579,12 @@
+@@ -572,10 +578,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -97626,7 +117100,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -611,7 +620,7 @@
+@@ -611,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -97635,7 +117109,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +658,9 @@
+@@ -649,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97657,7 +117131,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -295,6 +296,9 @@
+@@ -245,7 +246,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97667,7 +117149,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,6 +349,7 @@
+@@ -345,6 +348,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -97675,7 +117157,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -352,12 +357,9 @@
+@@ -352,12 +356,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -97688,7 +117170,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,10 +380,13 @@
+@@ -378,10 +379,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -97702,7 +117184,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -390,6 +395,7 @@
+@@ -390,6 +394,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -97710,7 +117192,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -551,6 +557,7 @@
+@@ -551,6 +556,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -97718,7 +117200,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -558,10 +565,12 @@
+@@ -558,10 +564,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -97731,7 +117213,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -597,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -97740,7 +117222,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -635,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97762,7 +117244,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97772,7 +117262,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -97780,7 +117270,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -97793,7 +117283,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -97807,7 +117297,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -97815,7 +117305,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -97823,7 +117313,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -97836,7 +117326,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -97845,7 +117335,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97867,7 +117357,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -294,6 +295,9 @@
+@@ -244,7 +245,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97877,7 +117375,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -344,6 +348,7 @@
+@@ -344,6 +347,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -97885,7 +117383,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -351,12 +356,9 @@
+@@ -351,12 +355,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -97898,7 +117396,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -377,10 +379,13 @@
+@@ -377,10 +378,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -97912,7 +117410,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -389,6 +394,7 @@
+@@ -389,6 +393,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -97920,7 +117418,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -550,6 +556,7 @@
+@@ -550,6 +555,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -97928,7 +117426,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -557,10 +564,12 @@
+@@ -557,10 +563,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -97941,7 +117439,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -594,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -97950,7 +117448,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -632,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -97972,7 +117470,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -309,6 +310,9 @@
+@@ -259,7 +260,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -97982,7 +117488,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -359,6 +363,7 @@
+@@ -359,6 +362,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -97990,7 +117496,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -366,12 +371,9 @@
+@@ -366,12 +370,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -98003,7 +117509,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -392,10 +394,13 @@
+@@ -392,10 +393,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -98017,7 +117523,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -404,6 +409,7 @@
+@@ -404,6 +408,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -98025,7 +117531,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -565,6 +571,7 @@
+@@ -565,6 +570,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -98033,7 +117539,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -572,10 +579,12 @@
+@@ -572,10 +578,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -98046,7 +117552,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -612,7 +621,7 @@
+@@ -612,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -98055,7 +117561,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +659,9 @@
+@@ -650,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98077,7 +117583,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -296,6 +297,9 @@
+@@ -246,7 +247,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98087,7 +117601,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -346,6 +350,7 @@
+@@ -346,6 +349,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -98095,7 +117609,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -353,12 +358,9 @@
+@@ -353,12 +357,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -98108,7 +117622,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -379,10 +381,13 @@
+@@ -379,10 +380,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -98122,7 +117636,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -391,6 +396,7 @@
+@@ -391,6 +395,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -98130,7 +117644,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -552,6 +558,7 @@
+@@ -552,6 +557,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -98138,7 +117652,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -559,10 +566,12 @@
+@@ -559,10 +565,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -98151,7 +117665,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -98160,7 +117674,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98182,7 +117696,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -313,6 +314,9 @@
+@@ -263,7 +264,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -313,6 +313,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98192,7 +117714,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -363,6 +367,7 @@
+@@ -363,6 +366,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -98200,7 +117722,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -370,12 +375,9 @@
+@@ -370,12 +374,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -98213,7 +117735,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -396,10 +398,13 @@
+@@ -396,10 +397,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -98227,7 +117749,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -408,6 +413,7 @@
+@@ -408,6 +412,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -98235,7 +117757,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -569,6 +575,7 @@
+@@ -569,6 +574,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -98243,7 +117765,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -576,10 +583,12 @@
+@@ -576,10 +582,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -98256,7 +117778,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -617,7 +626,7 @@
+@@ -617,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -98265,7 +117787,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +664,9 @@
+@@ -655,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98287,7 +117809,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -293,6 +294,9 @@
+@@ -243,7 +244,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98297,7 +117827,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -343,6 +347,7 @@
+@@ -343,6 +346,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -98305,7 +117835,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -350,12 +355,9 @@
+@@ -350,12 +354,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -98318,7 +117848,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -376,10 +378,13 @@
+@@ -376,10 +377,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -98332,7 +117862,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -388,6 +393,7 @@
+@@ -388,6 +392,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -98340,7 +117870,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -549,6 +555,7 @@
+@@ -549,6 +554,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -98348,7 +117878,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -556,10 +563,12 @@
+@@ -556,10 +562,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -98361,7 +117891,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -593,7 +602,7 @@
+@@ -593,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -98370,7 +117900,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +640,9 @@
+@@ -631,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98392,7 +117922,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -311,6 +312,9 @@
+@@ -261,7 +262,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98402,7 +117940,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -361,6 +365,7 @@
+@@ -361,6 +364,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -98410,7 +117948,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -368,12 +373,9 @@
+@@ -368,12 +372,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -98423,7 +117961,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -394,10 +396,13 @@
+@@ -394,10 +395,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -98437,7 +117975,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -406,6 +411,7 @@
+@@ -406,6 +410,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -98445,7 +117983,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -567,6 +573,7 @@
+@@ -567,6 +572,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -98453,7 +117991,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -574,10 +581,12 @@
+@@ -574,10 +580,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -98466,7 +118004,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -614,7 +623,7 @@
+@@ -614,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -98475,7 +118013,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +661,9 @@
+@@ -652,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98497,7 +118035,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98507,7 +118053,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -98515,7 +118061,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -98528,7 +118074,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -98542,7 +118088,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -98550,7 +118096,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -98558,7 +118104,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -98571,7 +118117,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -599,7 +608,7 @@
+@@ -599,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -98580,7 +118126,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +646,9 @@
+@@ -637,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98602,7 +118148,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -295,6 +296,9 @@
+@@ -245,7 +246,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98612,7 +118166,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -345,6 +349,7 @@
+@@ -345,6 +348,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -98620,7 +118174,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -352,12 +357,9 @@
+@@ -352,12 +356,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -98633,7 +118187,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -378,10 +380,13 @@
+@@ -378,10 +379,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -98647,7 +118201,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -390,6 +395,7 @@
+@@ -390,6 +394,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -98655,7 +118209,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -551,6 +557,7 @@
+@@ -551,6 +556,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -98663,7 +118217,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -558,10 +565,12 @@
+@@ -558,10 +564,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -98676,7 +118230,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -597,7 +606,7 @@
+@@ -597,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -98685,7 +118239,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +644,9 @@
+@@ -635,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98707,7 +118261,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -300,6 +301,9 @@
+@@ -250,7 +251,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98717,7 +118279,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -350,6 +354,7 @@
+@@ -350,6 +353,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -98725,7 +118287,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -357,12 +362,9 @@
+@@ -357,12 +361,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -98738,7 +118300,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -383,10 +385,13 @@
+@@ -383,10 +384,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -98752,7 +118314,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -395,6 +400,7 @@
+@@ -395,6 +399,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -98760,7 +118322,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -556,6 +562,7 @@
+@@ -556,6 +561,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -98768,7 +118330,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -563,10 +570,12 @@
+@@ -563,10 +569,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -98781,7 +118343,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -602,7 +611,7 @@
+@@ -602,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -98790,7 +118352,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +649,9 @@
+@@ -640,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98812,7 +118374,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -314,6 +315,9 @@
+@@ -264,7 +265,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -314,6 +314,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98822,7 +118392,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -364,6 +368,7 @@
+@@ -364,6 +367,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -98830,7 +118400,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -371,12 +376,9 @@
+@@ -371,12 +375,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -98843,7 +118413,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -397,10 +399,13 @@
+@@ -397,10 +398,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -98857,7 +118427,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -409,6 +414,7 @@
+@@ -409,6 +413,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -98865,7 +118435,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -570,6 +576,7 @@
+@@ -570,6 +575,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -98873,7 +118443,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -577,10 +584,12 @@
+@@ -577,10 +583,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -98886,7 +118456,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -624,7 +633,7 @@
+@@ -624,7 +632,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -98895,7 +118465,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -662,9 +671,9 @@
+@@ -662,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -98917,7 +118487,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -303,6 +304,9 @@
+@@ -253,7 +254,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -98927,7 +118505,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -353,6 +357,7 @@
+@@ -353,6 +356,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -98935,7 +118513,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -360,12 +365,9 @@
+@@ -360,12 +364,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -98948,7 +118526,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -386,10 +388,13 @@
+@@ -386,10 +387,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -98962,7 +118540,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -398,6 +403,7 @@
+@@ -398,6 +402,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -98970,7 +118548,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -559,6 +565,7 @@
+@@ -559,6 +564,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -98978,7 +118556,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -566,10 +573,12 @@
+@@ -566,10 +572,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -98991,7 +118569,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -610,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -99000,7 +118578,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -648,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99022,7 +118600,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99032,7 +118618,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -99040,7 +118626,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -99053,7 +118639,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -99067,7 +118653,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -99075,7 +118661,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -99083,7 +118669,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -99096,7 +118682,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -606,7 +615,7 @@
+@@ -606,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -99105,7 +118691,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +653,9 @@
+@@ -644,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99127,7 +118713,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -332,6 +333,9 @@
+@@ -282,7 +283,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -332,6 +332,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99137,7 +118731,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,6 +386,7 @@
+@@ -382,6 +385,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -99145,7 +118739,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -389,12 +394,9 @@
+@@ -389,12 +393,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -99158,7 +118752,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -415,10 +417,13 @@
+@@ -415,10 +416,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -99172,7 +118766,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -427,6 +432,7 @@
+@@ -427,6 +431,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -99180,7 +118774,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -588,6 +594,7 @@
+@@ -588,6 +593,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -99188,7 +118782,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -595,10 +602,12 @@
+@@ -595,10 +601,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -99201,7 +118795,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -658,7 +667,7 @@
+@@ -658,7 +666,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -99210,7 +118804,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -696,9 +705,9 @@
+@@ -696,9 +704,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99232,7 +118826,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99242,7 +118844,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -99250,7 +118852,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -99263,7 +118865,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -99277,7 +118879,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -99285,7 +118887,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -99293,7 +118895,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -99306,7 +118908,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -99315,7 +118917,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99337,7 +118939,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -285,6 +286,9 @@
+@@ -235,7 +236,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99347,7 +118957,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -335,6 +339,7 @@
+@@ -335,6 +338,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -99355,7 +118965,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -342,12 +347,9 @@
+@@ -342,12 +346,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -99368,7 +118978,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -368,10 +370,13 @@
+@@ -368,10 +369,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -99382,7 +118992,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -380,6 +385,7 @@
+@@ -380,6 +384,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -99390,7 +119000,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -541,6 +547,7 @@
+@@ -541,6 +546,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -99398,7 +119008,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -548,10 +555,12 @@
+@@ -548,10 +554,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -99411,7 +119021,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -582,7 +591,7 @@
+@@ -582,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -99420,7 +119030,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +629,9 @@
+@@ -620,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99442,7 +119052,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -276,6 +277,9 @@
+@@ -226,7 +227,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -276,6 +276,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99452,7 +119070,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -326,6 +330,7 @@
+@@ -326,6 +329,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -99460,7 +119078,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -333,12 +338,9 @@
+@@ -333,12 +337,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -99473,7 +119091,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -359,10 +361,13 @@
+@@ -359,10 +360,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -99487,7 +119105,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -371,6 +376,7 @@
+@@ -371,6 +375,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -99495,7 +119113,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -532,6 +538,7 @@
+@@ -532,6 +537,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -99503,7 +119121,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -539,10 +546,12 @@
+@@ -539,10 +545,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -99516,7 +119134,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -571,7 +580,7 @@
+@@ -571,7 +579,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -99525,7 +119143,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +618,9 @@
+@@ -609,9 +617,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99547,7 +119165,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -301,6 +302,9 @@
+@@ -251,7 +252,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99557,7 +119183,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -351,6 +355,7 @@
+@@ -351,6 +354,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -99565,7 +119191,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -358,12 +363,9 @@
+@@ -358,12 +362,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -99578,7 +119204,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -384,10 +386,13 @@
+@@ -384,10 +385,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -99592,7 +119218,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -396,6 +401,7 @@
+@@ -396,6 +400,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -99600,7 +119226,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -557,6 +563,7 @@
+@@ -557,6 +562,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -99608,7 +119234,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -564,10 +571,12 @@
+@@ -564,10 +570,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -99621,7 +119247,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -610,7 +619,7 @@
+@@ -610,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -99630,7 +119256,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +657,9 @@
+@@ -648,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99652,7 +119278,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -335,6 +336,9 @@
+@@ -285,7 +286,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -335,6 +335,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99662,7 +119296,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -385,6 +389,7 @@
+@@ -385,6 +388,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -99670,7 +119304,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -392,12 +397,9 @@
+@@ -392,12 +396,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -99683,7 +119317,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -418,10 +420,13 @@
+@@ -418,10 +419,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -99697,7 +119331,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -430,6 +435,7 @@
+@@ -430,6 +434,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -99705,7 +119339,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -591,6 +597,7 @@
+@@ -591,6 +596,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -99713,7 +119347,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -598,10 +605,12 @@
+@@ -598,10 +604,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -99726,7 +119360,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -659,7 +668,7 @@
+@@ -659,7 +667,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -99735,7 +119369,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -697,9 +706,9 @@
+@@ -697,9 +705,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99747,17 +119381,98 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1396,7 +1405,7 @@
- 	-rm -f  workspace.moc utils.moc main.moc sm.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
+@@ -1336,64 +1344,64 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
  
+ #>+ 3
+-workspace.moc: $(srcdir)/workspace.h
+-	$(MOC) $(srcdir)/workspace.h -o workspace.moc
++client.moc: $(srcdir)/client.h
++	$(MOC) $(srcdir)/client.h -o client.moc
+ 
  #>+ 2
--KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png HACKING COMPLIANCE sm.h group.h notifications.h Makefile.am tabbox.h 
-+KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png COMPLIANCE HACKING sm.h group.h notifications.h Makefile.am tabbox.h 
+-mocs: workspace.moc
++mocs: client.moc
  
- #>+ 4
- clean-idl:
-@@ -1408,17 +1417,17 @@
+ #>+ 3
+-utils.moc: $(srcdir)/utils.h
+-	$(MOC) $(srcdir)/utils.h -o utils.moc
++workspace.moc: $(srcdir)/workspace.h
++	$(MOC) $(srcdir)/workspace.h -o workspace.moc
  
+ #>+ 2
+-mocs: utils.moc
++mocs: workspace.moc
+ 
+ #>+ 3
+-main.moc: $(srcdir)/main.h
+-	$(MOC) $(srcdir)/main.h -o main.moc
++tabbox.moc: $(srcdir)/tabbox.h
++	$(MOC) $(srcdir)/tabbox.h -o tabbox.moc
+ 
+ #>+ 2
+-mocs: main.moc
++mocs: tabbox.moc
+ 
+ #>+ 3
+-sm.moc: $(srcdir)/sm.h
+-	$(MOC) $(srcdir)/sm.h -o sm.moc
++utils.moc: $(srcdir)/utils.h
++	$(MOC) $(srcdir)/utils.h -o utils.moc
+ 
+ #>+ 2
+-mocs: sm.moc
++mocs: utils.moc
+ 
+ #>+ 3
+-client.moc: $(srcdir)/client.h
+-	$(MOC) $(srcdir)/client.h -o client.moc
++popupinfo.moc: $(srcdir)/popupinfo.h
++	$(MOC) $(srcdir)/popupinfo.h -o popupinfo.moc
+ 
+ #>+ 2
+-mocs: client.moc
++mocs: popupinfo.moc
+ 
+ #>+ 3
+-tabbox.moc: $(srcdir)/tabbox.h
+-	$(MOC) $(srcdir)/tabbox.h -o tabbox.moc
++geometrytip.moc: $(srcdir)/geometrytip.h
++	$(MOC) $(srcdir)/geometrytip.h -o geometrytip.moc
+ 
+ #>+ 2
+-mocs: tabbox.moc
++mocs: geometrytip.moc
+ 
+ #>+ 3
+-popupinfo.moc: $(srcdir)/popupinfo.h
+-	$(MOC) $(srcdir)/popupinfo.h -o popupinfo.moc
++main.moc: $(srcdir)/main.h
++	$(MOC) $(srcdir)/main.h -o main.moc
+ 
+ #>+ 2
+-mocs: popupinfo.moc
++mocs: main.moc
+ 
+ #>+ 3
+-geometrytip.moc: $(srcdir)/geometrytip.h
+-	$(MOC) $(srcdir)/geometrytip.h -o geometrytip.moc
++sm.moc: $(srcdir)/sm.h
++	$(MOC) $(srcdir)/sm.h -o sm.moc
+ 
+ #>+ 2
+-mocs: geometrytip.moc
++mocs: sm.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  workspace.moc utils.moc main.moc sm.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
++	-rm -f  client.moc workspace.moc tabbox.moc utils.moc popupinfo.moc geometrytip.moc main.moc sm.moc
+ 
+ #>+ 2
+ KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png HACKING COMPLIANCE sm.h group.h notifications.h Makefile.am tabbox.h 
+@@ -1408,17 +1416,17 @@
+ 
  #>+ 13
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
@@ -99780,6 +119495,32 @@
  
  #>+ 15
  force-reedit:
+@@ -1459,7 +1467,7 @@
+ 
+ 
+ #>+ 11
+-libkdeinit_kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/client.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/utils.cpp $(srcdir)/layers.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/geometrytip.cpp $(srcdir)/sm.cpp $(srcdir)/group.cpp $(srcdir)/bridge.cpp $(srcdir)/manage.cpp $(srcdir)/notifications.cpp $(srcdir)/activation.cpp $(srcdir)/useractions.cpp $(srcdir)/geometry.cpp $(srcdir)/rules.cpp KWinInterface_skel.cpp  client.moc workspace.moc tabbox.moc popupinfo.moc utils.moc geometrytip.moc sm.moc main.moc
++libkdeinit_kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/client.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/utils.cpp $(srcdir)/layers.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/geometrytip.cpp $(srcdir)/sm.cpp $(srcdir)/group.cpp $(srcdir)/bridge.cpp $(srcdir)/manage.cpp $(srcdir)/notifications.cpp $(srcdir)/activation.cpp $(srcdir)/useractions.cpp $(srcdir)/geometry.cpp $(srcdir)/rules.cpp KWinInterface_skel.cpp  workspace.moc utils.moc sm.moc main.moc client.moc tabbox.moc popupinfo.moc geometrytip.moc
+ 	@echo 'creating libkdeinit_kwin_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeinit_kwin_la.all_cpp.files libkdeinit_kwin_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kwin_la.all_cpp.final; \
+@@ -1512,13 +1520,13 @@
+ tabbox.lo: tabbox.moc 
+ main.lo: main.moc 
+ geometrytip.o: geometrytip.moc 
+-client.lo: client.moc 
+ utils.lo: utils.moc 
++client.lo: client.moc 
++main.o: main.moc 
++utils.o: utils.moc 
+ libkdeinit_kwin.la: $(libkdeinit_kwin_la_OBJECTS) $(libkdeinit_kwin_la_DEPENDENCIES)
+ 	$(CXXLINK) -rpath $(libdir) $(libkdeinit_kwin_la_LDFLAGS) $(libkdeinit_kwin_la_OBJECTS) $(libkdeinit_kwin_la_LIBADD) $(LIBS)
+ 
+-utils.o: utils.moc 
+-main.o: main.moc 
+ client.o: client.moc 
+ nmcheck: 
+ geometrytip.lo: geometrytip.moc 
 --- kwin/oldheaders/Makefile.in
 +++ kwin/oldheaders/Makefile.in
 @@ -120,6 +120,7 @@
@@ -99790,7 +119531,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -264,6 +265,9 @@
+@@ -214,7 +215,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -264,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99800,7 +119549,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -314,6 +318,7 @@
+@@ -314,6 +317,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -99808,7 +119557,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -321,12 +326,9 @@
+@@ -321,12 +325,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -99821,7 +119570,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -347,10 +349,13 @@
+@@ -347,10 +348,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -99835,7 +119584,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -359,6 +364,7 @@
+@@ -359,6 +363,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -99843,7 +119592,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -520,6 +526,7 @@
+@@ -520,6 +525,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -99851,7 +119600,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -527,10 +534,12 @@
+@@ -527,10 +533,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -99864,7 +119613,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -557,7 +566,7 @@
+@@ -557,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -99873,7 +119622,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +604,9 @@
+@@ -595,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99895,7 +119644,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -99905,7 +119662,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -99913,7 +119670,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -99926,7 +119683,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -99940,7 +119697,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -99948,7 +119705,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -99956,7 +119713,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -99969,7 +119726,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -558,7 +567,7 @@
+@@ -558,7 +566,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -99978,7 +119735,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +605,9 @@
+@@ -596,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -99990,7 +119747,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -758,7 +767,7 @@
+@@ -758,7 +766,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -100009,7 +119766,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -285,6 +286,9 @@
+@@ -235,7 +236,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100019,7 +119784,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -335,6 +339,7 @@
+@@ -335,6 +338,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -100027,7 +119792,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -342,12 +347,9 @@
+@@ -342,12 +346,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -100040,7 +119805,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -368,10 +370,13 @@
+@@ -368,10 +369,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -100054,7 +119819,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -380,6 +385,7 @@
+@@ -380,6 +384,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -100062,7 +119827,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -541,6 +547,7 @@
+@@ -541,6 +546,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -100070,7 +119835,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -548,10 +555,12 @@
+@@ -548,10 +554,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -100083,7 +119848,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -582,7 +591,7 @@
+@@ -582,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -100092,7 +119857,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +629,9 @@
+@@ -620,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100114,7 +119879,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -297,6 +298,9 @@
+@@ -247,7 +248,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100124,7 +119897,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -347,6 +351,7 @@
+@@ -347,6 +350,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -100132,7 +119905,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -354,12 +359,9 @@
+@@ -354,12 +358,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -100145,7 +119918,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -380,10 +382,13 @@
+@@ -380,10 +381,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -100159,7 +119932,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -392,6 +397,7 @@
+@@ -392,6 +396,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -100167,7 +119940,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -553,6 +559,7 @@
+@@ -553,6 +558,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -100175,7 +119948,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -560,10 +567,12 @@
+@@ -560,10 +566,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -100188,7 +119961,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -595,7 +604,7 @@
+@@ -595,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -100197,7 +119970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +642,9 @@
+@@ -633,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100219,7 +119992,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -341,6 +342,9 @@
+@@ -291,7 +292,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -341,6 +341,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100229,7 +120010,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -391,6 +395,7 @@
+@@ -391,6 +394,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -100237,7 +120018,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -398,12 +403,9 @@
+@@ -398,12 +402,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -100250,7 +120031,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -424,10 +426,13 @@
+@@ -424,10 +425,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -100264,7 +120045,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -436,6 +441,7 @@
+@@ -436,6 +440,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -100272,7 +120053,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -597,6 +603,7 @@
+@@ -597,6 +602,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -100280,7 +120061,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -604,10 +611,12 @@
+@@ -604,10 +610,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -100293,7 +120074,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -672,7 +681,7 @@
+@@ -672,7 +680,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -100302,7 +120083,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -710,9 +719,9 @@
+@@ -710,9 +718,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100324,7 +120105,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100334,7 +120123,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -100342,7 +120131,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -100355,7 +120144,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -100369,7 +120158,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -100377,7 +120166,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -100385,7 +120174,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -100398,7 +120187,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -543,7 +552,7 @@
+@@ -543,7 +551,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -100407,7 +120196,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +590,9 @@
+@@ -581,9 +589,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100419,6 +120208,25 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -735,15 +743,15 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kxkb.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kxkb.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-kxkb.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kxkb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kxkb.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kxkb.png
+ 
+ #>+ 15
+ force-reedit:
 --- l10n/Makefile.in
 +++ l10n/Makefile.in
 @@ -118,6 +118,7 @@
@@ -100429,7 +120237,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -262,6 +263,9 @@
+@@ -212,7 +213,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100439,7 +120255,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -312,6 +316,7 @@
+@@ -312,6 +315,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -100447,7 +120263,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -319,12 +324,9 @@
+@@ -319,12 +323,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -100460,7 +120276,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -345,10 +347,13 @@
+@@ -345,10 +346,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -100474,7 +120290,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -357,6 +362,7 @@
+@@ -357,6 +361,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -100482,7 +120298,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -518,6 +524,7 @@
+@@ -518,6 +523,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -100490,7 +120306,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -525,10 +532,12 @@
+@@ -525,10 +531,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -100503,7 +120319,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -564,7 +573,7 @@
+@@ -564,7 +572,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -100512,7 +120328,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +611,9 @@
+@@ -602,9 +610,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100524,7 +120340,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -775,7 +784,7 @@
+@@ -775,7 +783,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -100543,7 +120359,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -302,6 +303,9 @@
+@@ -252,7 +253,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100553,7 +120377,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -352,6 +356,7 @@
+@@ -352,6 +355,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -100561,7 +120385,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -359,12 +364,9 @@
+@@ -359,12 +363,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -100574,7 +120398,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -385,10 +387,13 @@
+@@ -385,10 +386,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -100588,7 +120412,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -397,6 +402,7 @@
+@@ -397,6 +401,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -100596,7 +120420,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -558,6 +564,7 @@
+@@ -558,6 +563,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -100604,7 +120428,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -565,10 +572,12 @@
+@@ -565,10 +571,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -100617,7 +120441,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -607,7 +616,7 @@
+@@ -607,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -100626,7 +120450,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +654,9 @@
+@@ -645,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100648,7 +120472,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -355,6 +356,9 @@
+@@ -305,7 +306,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -355,6 +355,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100658,7 +120490,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -405,6 +409,7 @@
+@@ -405,6 +408,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -100666,7 +120498,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -412,12 +417,9 @@
+@@ -412,12 +416,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -100679,7 +120511,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -438,10 +440,13 @@
+@@ -438,10 +439,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -100693,7 +120525,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -450,6 +455,7 @@
+@@ -450,6 +454,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -100701,7 +120533,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -611,6 +617,7 @@
+@@ -611,6 +616,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -100709,7 +120541,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -618,10 +625,12 @@
+@@ -618,10 +624,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -100722,7 +120554,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -698,7 +707,7 @@
+@@ -698,7 +706,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -100731,7 +120563,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -736,9 +745,9 @@
+@@ -736,9 +744,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100743,32 +120575,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1341,18 +1350,18 @@
- mocs: konq_iconviewwidget.moc
- 
- #>+ 3
--konq_dirpart.moc: $(srcdir)/konq_dirpart.h
--	$(MOC) $(srcdir)/konq_dirpart.h -o konq_dirpart.moc
-+konq_drag.moc: $(srcdir)/konq_drag.h
-+	$(MOC) $(srcdir)/konq_drag.h -o konq_drag.moc
- 
- #>+ 2
--mocs: konq_dirpart.moc
-+mocs: konq_drag.moc
- 
- #>+ 3
--konq_drag.moc: $(srcdir)/konq_drag.h
--	$(MOC) $(srcdir)/konq_drag.h -o konq_drag.moc
-+konq_dirpart.moc: $(srcdir)/konq_dirpart.h
-+	$(MOC) $(srcdir)/konq_dirpart.h -o konq_dirpart.moc
- 
- #>+ 2
--mocs: konq_drag.moc
-+mocs: konq_dirpart.moc
- 
- #>+ 3
- knewmenu.moc: $(srcdir)/knewmenu.h
-@@ -1362,18 +1371,18 @@
+@@ -1362,18 +1370,18 @@
  mocs: knewmenu.moc
  
  #>+ 3
@@ -100793,50 +120600,25 @@
  
  #>+ 3
  konq_faviconmgr.moc: $(srcdir)/konq_faviconmgr.h
-@@ -1390,18 +1399,18 @@
- mocs: konq_undo.moc
+@@ -1428,7 +1436,7 @@
  
  #>+ 3
--konq_popupmenu.moc: $(srcdir)/konq_popupmenu.h
--	$(MOC) $(srcdir)/konq_popupmenu.h -o konq_popupmenu.moc
-+konq_bgnddlg.moc: $(srcdir)/konq_bgnddlg.h
-+	$(MOC) $(srcdir)/konq_bgnddlg.h -o konq_bgnddlg.moc
- 
- #>+ 2
--mocs: konq_popupmenu.moc
-+mocs: konq_bgnddlg.moc
- 
- #>+ 3
--konq_bgnddlg.moc: $(srcdir)/konq_bgnddlg.h
--	$(MOC) $(srcdir)/konq_bgnddlg.h -o konq_bgnddlg.moc
-+konq_popupmenu.moc: $(srcdir)/konq_popupmenu.h
-+	$(MOC) $(srcdir)/konq_popupmenu.h -o konq_popupmenu.moc
- 
- #>+ 2
--mocs: konq_bgnddlg.moc
-+mocs: konq_popupmenu.moc
- 
- #>+ 13
- konq_undo.kidl: $(srcdir)/konq_undo.h $(DCOP_DEPENDENCIES)
-@@ -1428,7 +1437,7 @@
- 
- #>+ 3
  clean-metasources:
 -	-rm -f  konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc konq_operations.moc kivdirectoryoverlay.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
-+	-rm -f  konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_drag.moc konq_dirpart.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
++	-rm -f  konq_filetip.moc konq_historymgr.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
  
  #>+ 2
  KDE_DIST=SERVICEMENUS DESIGN Makefile.in konq_bgnddlg.h directory_bookmarkbar.desktop konqpopupmenuplugin.desktop PLUGINS Makefile.am 
-@@ -1486,7 +1495,7 @@
+@@ -1486,7 +1494,7 @@
  
  
  #>+ 11
 -libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc  konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc konq_operations.moc kivdirectoryoverlay.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
-+libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc  konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_drag.moc konq_dirpart.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_popupmenu.moc konq_bgnddlg.moc
++libkonq_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_popupmenu.cc $(srcdir)/knewmenu.cc $(srcdir)/konq_xmlguiclient.cc $(srcdir)/kfileivi.cc $(srcdir)/konq_iconviewwidget.cc $(srcdir)/konq_settings.cc $(srcdir)/konq_drag.cc $(srcdir)/konq_operations.cc $(srcdir)/konq_dirpart.cc $(srcdir)/konq_propsview.cc $(srcdir)/konq_events.cc $(srcdir)/konq_bgnddlg.cc $(srcdir)/konq_undo.cc $(srcdir)/konq_historymgr.cc $(srcdir)/konq_historycomm.cc $(srcdir)/konq_pixmapprovider.cc $(srcdir)/kivdirectoryoverlay.cc $(srcdir)/konq_faviconmgr.cc $(srcdir)/konq_filetip.cc konq_undo_skel.cc konq_historycomm_skel.cc konq_faviconmgr_skel.cc  konq_historymgr.moc konq_filetip.moc konq_iconviewwidget.moc konq_dirpart.moc konq_drag.moc knewmenu.moc kivdirectoryoverlay.moc konq_operations.moc konq_faviconmgr.moc konq_undo.moc konq_bgnddlg.moc konq_popupmenu.moc
  	@echo 'creating libkonq_la.all_cc.cc ...'; \
  	rm -f libkonq_la.all_cc.files libkonq_la.all_cc.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkonq_la.all_cc.final; \
-@@ -1527,8 +1536,8 @@
+@@ -1527,8 +1535,8 @@
  konq_bgnddlg.o: konq_bgnddlg.moc 
  konq_bgnddlg.lo: konq_bgnddlg.moc 
  konq_faviconmgr.lo: konq_faviconmgr.moc 
@@ -100846,16 +120628,6 @@
  konq_filetip.lo: konq_filetip.moc 
  konq_drag.lo: konq_drag.moc 
  konq_popupmenu.o: konq_popupmenu.moc 
-@@ -1536,8 +1545,8 @@
- konq_iconviewwidget.o: konq_iconviewwidget.moc 
- konq_faviconmgr.o: konq_faviconmgr.moc 
- konq_undo.o: konq_undo.moc 
--konq_historymgr.o: konq_historymgr.moc 
- konq_dirpart.lo: konq_dirpart.moc 
-+konq_historymgr.o: konq_historymgr.moc 
- nmcheck: 
- konq_iconviewwidget.lo: konq_iconviewwidget.moc 
- nmcheck-am: nmcheck
 --- libkonq/pics/Makefile.in
 +++ libkonq/pics/Makefile.in
 @@ -117,6 +117,7 @@
@@ -100866,7 +120638,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100876,7 +120656,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -100884,7 +120664,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -100897,7 +120677,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -100911,7 +120691,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -100919,7 +120699,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -100927,7 +120707,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -100940,7 +120720,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -554,7 +563,7 @@
+@@ -554,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -100949,7 +120729,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +601,9 @@
+@@ -592,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -100971,7 +120751,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -280,6 +281,9 @@
+@@ -230,7 +231,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -100981,7 +120769,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -330,6 +334,7 @@
+@@ -330,6 +333,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -100989,7 +120777,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -337,12 +342,9 @@
+@@ -337,12 +341,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -101002,7 +120790,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -363,10 +365,13 @@
+@@ -363,10 +364,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -101016,7 +120804,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -375,6 +380,7 @@
+@@ -375,6 +379,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -101024,7 +120812,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -536,6 +542,7 @@
+@@ -536,6 +541,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -101032,7 +120820,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -543,10 +550,12 @@
+@@ -543,10 +549,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -101045,7 +120833,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -577,7 +586,7 @@
+@@ -577,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -101054,7 +120842,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +624,9 @@
+@@ -615,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101076,7 +120864,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -289,6 +290,9 @@
+@@ -239,7 +240,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101086,7 +120882,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -339,6 +343,7 @@
+@@ -339,6 +342,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -101094,7 +120890,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -346,12 +351,9 @@
+@@ -346,12 +350,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -101107,7 +120903,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -372,10 +374,13 @@
+@@ -372,10 +373,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -101121,7 +120917,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -384,6 +389,7 @@
+@@ -384,6 +388,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -101129,7 +120925,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -545,6 +551,7 @@
+@@ -545,6 +550,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -101137,7 +120933,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -552,10 +559,12 @@
+@@ -552,10 +558,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -101150,7 +120946,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -592,7 +601,7 @@
+@@ -592,7 +600,7 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -101159,7 +120955,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,12 +643,12 @@
+@@ -634,12 +642,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -101174,7 +120970,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -651,7 +660,7 @@
+@@ -651,7 +659,7 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -101183,12 +120979,12 @@
  	cd $(top_srcdir) && $(AUTOHEADER)
  	rm -f stamp-h1
  	touch $@
-@@ -1188,7 +1197,7 @@
+@@ -1188,7 +1196,7 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=startkde Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 kdebase.lsm Makefile.am.in 
-+KDE_DIST=Mainpage.dox stamp-h.in startkde subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 configure kdebase.lsm Makefile.am.in 
++KDE_DIST=startkde stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 configure Makefile.am Makefile.am.in kdebase.lsm 
  
  #>+ 2
  docs-am:
@@ -101202,7 +120998,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -332,6 +333,9 @@
+@@ -282,7 +283,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -332,6 +332,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101212,7 +121016,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -382,6 +386,7 @@
+@@ -382,6 +385,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -101220,7 +121024,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -389,12 +394,9 @@
+@@ -389,12 +393,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -101233,7 +121037,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -415,10 +417,13 @@
+@@ -415,10 +416,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -101247,7 +121051,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -427,6 +432,7 @@
+@@ -427,6 +431,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -101255,7 +121059,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -588,6 +594,7 @@
+@@ -588,6 +593,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -101263,7 +121067,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -595,10 +602,12 @@
+@@ -595,10 +601,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -101276,7 +121080,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -653,7 +662,7 @@
+@@ -653,7 +661,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -101285,7 +121089,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -691,9 +700,9 @@
+@@ -691,9 +699,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101307,7 +121111,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -284,6 +285,9 @@
+@@ -234,7 +235,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101317,7 +121129,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -334,6 +338,7 @@
+@@ -334,6 +337,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -101325,7 +121137,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -341,12 +346,9 @@
+@@ -341,12 +345,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -101338,7 +121150,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -367,10 +369,13 @@
+@@ -367,10 +368,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -101352,7 +121164,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -379,6 +384,7 @@
+@@ -379,6 +383,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -101360,7 +121172,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -540,6 +546,7 @@
+@@ -540,6 +545,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -101368,7 +121180,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -547,10 +554,12 @@
+@@ -547,10 +553,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -101381,7 +121193,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -582,7 +591,7 @@
+@@ -582,7 +590,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -101390,7 +121202,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +629,9 @@
+@@ -620,9 +628,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101412,7 +121224,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -291,6 +292,9 @@
+@@ -241,7 +242,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -291,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101422,7 +121242,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -341,6 +345,7 @@
+@@ -341,6 +344,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -101430,7 +121250,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -348,12 +353,9 @@
+@@ -348,12 +352,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -101443,7 +121263,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -374,10 +376,13 @@
+@@ -374,10 +375,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -101457,7 +121277,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -386,6 +391,7 @@
+@@ -386,6 +390,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -101465,7 +121285,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -547,6 +553,7 @@
+@@ -547,6 +552,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -101473,7 +121293,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -554,10 +561,12 @@
+@@ -554,10 +560,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -101486,7 +121306,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -594,7 +603,7 @@
+@@ -594,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -101495,7 +121315,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +641,9 @@
+@@ -632,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101517,7 +121337,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -279,6 +280,9 @@
+@@ -229,7 +230,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -279,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101527,7 +121355,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -329,6 +333,7 @@
+@@ -329,6 +332,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -101535,7 +121363,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -336,12 +341,9 @@
+@@ -336,12 +340,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -101548,7 +121376,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -362,10 +364,13 @@
+@@ -362,10 +363,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -101562,7 +121390,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -374,6 +379,7 @@
+@@ -374,6 +378,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -101570,7 +121398,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -535,6 +541,7 @@
+@@ -535,6 +540,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -101578,7 +121406,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -542,10 +549,12 @@
+@@ -542,10 +548,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -101591,7 +121419,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -574,7 +583,7 @@
+@@ -574,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -101600,7 +121428,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +621,9 @@
+@@ -612,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101622,7 +121450,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -251,6 +252,9 @@
+@@ -201,7 +202,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -101632,7 +121468,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -301,6 +305,7 @@
+@@ -301,6 +304,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -101640,7 +121476,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -308,12 +313,9 @@
+@@ -308,12 +312,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -101653,7 +121489,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -334,10 +336,13 @@
+@@ -334,10 +335,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -101667,7 +121503,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -346,6 +351,7 @@
+@@ -346,6 +350,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -101675,7 +121511,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -507,6 +513,7 @@
+@@ -507,6 +512,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -101683,7 +121519,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -514,10 +521,12 @@
+@@ -514,10 +520,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -101696,7 +121532,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -543,7 +552,7 @@
+@@ -543,7 +551,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -101705,7 +121541,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +590,9 @@
+@@ -581,9 +589,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -101717,12 +121553,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,842 +735,842 @@
+@@ -726,842 +734,842 @@
  .NOEXPORT:
  
  #>+ 2
 -KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-xedit.png cr48-app-gaim.png crsc-app-antivirus.svgz cr16-app-assistant.png cr48-app-kbinaryclock.png cr32-app-mozilla.png cr64-app-licq.png cr32-app-xmag.png cr16-app-applixware.png cr48-app-xv.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-linuxconf.png cr48-app-package_settings.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-realplayer.png cr16-app-package_edutainment.png cr128-app-taskbar.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-taskbar.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-mathematica.png cr32-app-gnumeric.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png cr16-app-xfig.png crsc-app-systemtray.svgz cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png crsc-app-kfm_home.svgz cr64-app-linuxconf.png cr32-app-edu_science.png cr16-app-package_wordprocessing.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr64-app-phppg.png cr32-app-blender.png cr16-app-sodipodi.png cr32-app-xedit.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz crsc-app-aktion.svgz cr16-app-licq.png cr128-app-pysol.png cr32-app-package_multimedia.png cr16-app-kvirc.png cr16-app-netscape.png cr128-app-linuxconf.png Makefile.in cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr22-app-fifteenpieces.png cr128-app-package_network.png cr32-app-pybliographic.png cr32-app-pinguin.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-mathematica.png cr16-app-pybliographic.png cr16-app-clanbomber.png cr64-app-kfm_home.png cr22-app-package_development.png crsc-app-terminal.svgz cr32-app-xapp.png cr48-app-licq.png cr16-app-package_applications.png cr48-app-xfmail.png cr64-app-applixware.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png cr64-app-package.png crsc-app-quicktime.svgz cr22-app-kbinaryclock.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr32-app-package_games.png cr32-app-wine.png cr64-app-wp.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png cr32-app-package_games_board.png crsc-app-fifteenpieces.svgz cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr16-app-runprocesscatcher.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr32-app-terminal.png cr64-app-taskbar.png cr16-app-package_application.png cr16-app-package_games.png cr64-app-systemtray.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr48-app-mozilla.png cr32-app-package_games_arcade.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr32-app-systemtray.png cr48-app-opera.png cr128-app-terminal.png cr16-app-systemtray.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-taskbar.png cr32-app-x.png cr48-app-kfm_home.png cr16-app-mozilla.png crsc-app-xclock.svgz cr32-app-clanbomber.png cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr48-app-xemacs.png cr48-app-package.png cr64-app-gimp.png cr48-app-pan.png cr16-app-blender.png cr48-app-pysol.png cr48-app-designer.png cr48-app-systemtray.png cr48-app-package_games_strategy.png cr64-app-randr.png crsc-app-my_mac.svgz cr32-app-xeyes.png cr32-app-acroread.png cr16-app-evolution.png crsc-app-shell.svgz cr48-app-xchat.png cr16-app-acroread.png cr64-app-package_settings.png cr128-app-email.png cr128-app-applixware.png cr48-app-planner.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-package_games_strategy.png cr32-app-gv.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr32-app-xfig.png cr16-app-gvim.png cr16-app-linuxconf.png cr16-app-wabi.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png cr32-app-package_edutainment.png crsc-app-x.svgz cr48-app-randr.png crsc-app-camera.svgz cr48-app-abiword.png cr16-app-nedit.png cr32-app-linuxconf.png cr16-app-xv.png cr32-app-gabber.png cr16-app-gnomemeeting.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr48-app-fifteenpieces.png cr16-app-gv.png cr48-app-netscape.png cr16-app-package_development.png cr64-app-xmag.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr128-app-mozilla.png cr48-app-kvirc.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-systemtray.png cr128-app-gimp.png cr16-app-fifteenpieces.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-vnc.png cr16-app-package_network.png cr16-app-kfm_home.png cr32-app-xclock.png cr22-app-taskbar.png cr32-app-wabi.png cr128-app-clanbomber.png cr22-app-systemtray.png cr48-app-scribus.png cr128-app-tux.png cr32-app-kbinaryclock.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr48-app-package_system.png cr22-app-runprocesscatcher.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-runprocesscatcher.png cr32-app-email.png cr32-app-package_utilities.png cr48-app-nedit.png cr128-app-penguin.png cr16-app-gaim.png cr128-app-xmag.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr32-app-xmms.png cr48-app-package_development.png cr48-app-package_toys.png cr32-app-abiword.png cr32-app-xemacs.png crsc-app-wine.svgz cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr32-app-alevt.png cr64-app-mozilla.png cr16-app-xmms.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr16-app-planner.png cr32-app-nedit.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png crsc-app-error.svgz cr48-app-tux.png cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png cr64-app-qtella.png crsc-app-package_development.svgz crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr64-app-acroread.png cr16-app-kbinaryclock.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr16-app-edu_miscellaneous.png cr32-app-galeon.png cr48-app-dia.png cr32-app-plan.png cr16-app-linguist.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.png cr48-app-firefox.png cr48-app-phppg.png cr128-app-package.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr32-app-fifteenpieces.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr48-app-package_games_card.png cr64-app-netscape.png crsc-app-kbinaryclock.svgz cr128-app-xclock.png cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr48-app-taskbar.png cr16-app-xload.png 
-+KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-xedit.png cr48-app-gaim.png crsc-app-antivirus.svgz cr16-app-assistant.png cr48-app-kbinaryclock.png cr32-app-mozilla.png cr64-app-licq.png cr48-app-xv.png cr32-app-xmag.png cr16-app-applixware.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-package_settings.png cr16-app-package_settings.png cr48-app-linuxconf.png cr32-app-gnomemeeting.png cr16-app-package_edutainment.png cr16-app-realplayer.png cr128-app-taskbar.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-taskbar.png cr16-app-thunderbird.png cr32-app-mathematica.png cr32-app-gnumeric.png cr48-app-package_games_arcade.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png cr16-app-xfig.png crsc-app-systemtray.svgz cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png crsc-app-kfm_home.svgz cr64-app-linuxconf.png cr16-app-package_wordprocessing.png cr32-app-edu_science.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_development.png cr128-app-package_utilities.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr64-app-package_multimedia.png cr48-app-galeon.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr32-app-blender.png cr64-app-phppg.png cr16-app-sodipodi.png cr48-app-clanbomber.png cr32-app-xedit.png cr32-app-xclipboard.png crsc-app-openoffice.svgz cr32-app-package_multimedia.png cr16-app-licq.png crsc-app-aktion.svgz cr128-app-pysol.png cr16-app-netscape.png cr16-app-kvirc.png Makefile.in cr128-app-linuxconf.png cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr128-app-wp.png cr64-app-package_toys.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr22-app-fifteenpieces.png cr128-app-package_network.png cr32-app-pybliographic.png cr32-app-pinguin.png cr32-app-eclipse.png cr16-app-designer.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr22-app-kvirc.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr32-app-applixware.png cr16-app-pybliographic.png cr16-app-mathematica.png cr16-app-clanbomber.png cr22-app-package_development.png cr64-app-kfm_home.png crsc-app-terminal.svgz cr32-app-xapp.png cr48-app-licq.png cr16-app-package_applications.png cr48-app-xfmail.png cr64-app-applixware.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png cr64-app-package_favourite.png crsc-app-realplayer.svgz cr16-app-gimp.png cr64-app-package.png crsc-app-quicktime.svgz cr22-app-kbinaryclock.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr32-app-wine.png cr32-app-package_games.png cr64-app-wp.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png cr48-app-package_games_board.png cr32-app-package_games_board.png cr64-app-penguin.png crsc-app-fifteenpieces.svgz cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr16-app-runprocesscatcher.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr32-app-terminal.png cr64-app-taskbar.png cr16-app-package_games.png cr16-app-package_application.png cr64-app-systemtray.png cr48-app-staroffice.png cr16-app-phppg.png crsc-app-xcalc.svgz cr48-app-gnucash.png cr48-app-mozilla.png cr32-app-package_games_arcade.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr32-app-systemtray.png cr16-app-systemtray.png cr128-app-terminal.png cr48-app-opera.png crsc-app-core.svgz cr48-app-evolution.png crsc-app-display.svgz cr64-app-terminal.png cr32-app-taskbar.png cr32-app-x.png cr16-app-dia.png cr48-app-kfm_home.png cr16-app-mozilla.png crsc-app-xclock.svgz cr32-app-clanbomber.png cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr48-app-package.png cr64-app-gimp.png cr48-app-xemacs.png cr48-app-pan.png cr16-app-blender.png cr48-app-pysol.png cr48-app-designer.png cr48-app-systemtray.png cr64-app-randr.png cr48-app-package_games_strategy.png crsc-app-my_mac.svgz cr16-app-evolution.png cr32-app-acroread.png cr32-app-xeyes.png crsc-app-shell.svgz cr48-app-xchat.png cr16-app-acroread.png cr64-app-package_settings.png cr128-app-email.png cr48-app-planner.png cr128-app-applixware.png cr48-app-vnc.png cr128-app-staroffice.png crsc-app-gnome_apps.svgz cr32-app-xcalc.png cr48-app-applixware.png cr48-app-mozilla_mail.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-package_games_strategy.png cr32-app-gv.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr16-app-gvim.png cr32-app-xfig.png cr16-app-linuxconf.png cr16-app-wabi.png cr32-app-package_settings.png cr32-app-xosview.png cr16-app-email.png cr32-app-vnc.png cr16-app-lyx.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png crsc-app-x.svgz cr32-app-package_edutainment.png crsc-app-camera.svgz cr48-app-randr.png cr16-app-nedit.png cr48-app-abiword.png cr32-app-linuxconf.png cr32-app-gabber.png cr16-app-xv.png cr16-app-gnomemeeting.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr16-app-gv.png cr48-app-fifteenpieces.png cr48-app-netscape.png cr64-app-xmag.png cr16-app-package_development.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr128-app-mozilla.png cr48-app-kvirc.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-systemtray.png cr128-app-gimp.png cr16-app-package_utilities.png cr16-app-fifteenpieces.png cr48-app-bluefish.png cr16-app-kfm_home.png cr16-app-vnc.png cr32-app-xclock.png cr16-app-package_network.png cr32-app-wabi.png cr22-app-taskbar.png cr128-app-clanbomber.png cr22-app-systemtray.png cr48-app-scribus.png cr128-app-tux.png cr32-app-kbinaryclock.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr22-app-runprocesscatcher.png cr48-app-package_system.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-runprocesscatcher.png cr32-app-email.png cr32-app-package_utilities.png cr128-app-xmag.png cr48-app-nedit.png cr128-app-penguin.png cr16-app-gaim.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr32-app-xmms.png cr48-app-package_development.png cr48-app-package_toys.png cr32-app-xemacs.png cr32-app-abiword.png crsc-app-wine.svgz cr48-app-gnumeric.png cr16-app-abiword.png cr16-app-xcalc.png cr64-app-xclock.png cr32-app-package_applications.png cr64-app-mozilla.png cr16-app-xmms.png cr32-app-alevt.png cr48-app-email.png cr48-app-package_utilities.png cr32-app-realplayer.png crsc-app-aim.svgz cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr16-app-planner.png cr32-app-nedit.png cr128-app-netscape.png cr16-app-package.png cr16-app-package_toys.png cr32-app-package_graphics.png cr32-app-kvirc.png cr16-app-xmag.png cr32-app-scribus.png crsc-app-error.svgz cr48-app-tux.png cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr32-app-xconsole.png cr128-app-package_favourite.png cr16-app-bluefish.png cr64-app-qtella.png crsc-app-package_development.svgz crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr64-app-acroread.png cr16-app-kbinaryclock.png cr48-app-package_graphics.png crsc-app-download_manager.svgz cr32-app-wp.png cr16-app-package_graphics.png cr16-app-wp.png cr32-app-firefox.png cr16-app-edu_miscellaneous.png cr32-app-galeon.png cr48-app-dia.png cr32-app-plan.png cr16-app-linguist.png cr16-app-firefox.png cr48-app-package_editors.png cr128-app-package_settings.png cr48-app-firefox.png cr48-app-phppg.png cr128-app-package.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr32-app-fifteenpieces.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png cr48-app-package_games_card.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr64-app-netscape.png cr128-app-xclock.png crsc-app-kbinaryclock.svgz cr32-app-package_network.png cr16-app-terminal.png Makefile.am cr32-app-gnome_apps.png cr48-app-taskbar.png cr16-app-xload.png 
++KDE_DIST=cr32-app-sodipodi.png cr48-app-terminal.png cr48-app-gaim.png cr48-app-xedit.png crsc-app-antivirus.svgz cr16-app-assistant.png cr32-app-mozilla.png cr48-app-kbinaryclock.png cr64-app-licq.png cr48-app-xv.png cr16-app-applixware.png cr32-app-xmag.png cr64-app-package_network.png cr32-app-planner.png cr32-app-penguin.png cr64-app-package_development.png crsc-app-hardware.svgz cr16-app-remote.png cr32-app-edu_miscellaneous.png cr16-app-gnucash.png cr48-app-package_settings.png cr48-app-linuxconf.png cr16-app-package_settings.png cr32-app-gnomemeeting.png cr16-app-package_edutainment.png cr16-app-realplayer.png cr128-app-taskbar.png cr32-app-edu_mathematics.png cr128-app-package_multimedia.png cr16-app-taskbar.png cr16-app-thunderbird.png cr48-app-package_games_arcade.png cr32-app-gnumeric.png cr32-app-mathematica.png cr16-app-gnome_apps.png cr16-app-xchat.png cr48-app-package_favourite.png cr16-app-wine.png cr32-app-package_favourite.png cr16-app-package_editors.png cr32-app-xchat.png cr128-app-package_games.png crsc-app-systemtray.svgz cr16-app-xfig.png cr48-app-wmaker_apps.png cr32-app-thunderbird.png cr48-app-gnome_apps.png cr32-app-designer.png crsc-app-kfm_home.svgz cr64-app-linuxconf.png cr16-app-package_wordprocessing.png cr32-app-edu_science.png cr16-app-mozilla_m.png cr48-app-sodipodi.png cr128-app-package_utilities.png cr128-app-package_development.png cr48-app-package_multimedia.png cr16-app-package_favourite.png cr32-app-mozilla_mail.png cr22-app-randr.png cr16-app-package_multimedia.png cr48-app-galeon.png cr64-app-package_multimedia.png crsc-app-clanbomber.svgz cr16-app-xconsole.png cr32-app-blender.png cr64-app-phppg.png cr32-app-xedit.png cr16-app-sodipodi.png cr48-app-clanbomber.png cr32-app-xclipboard.png crsc-app-openoffice.svgz cr32-app-package_multimedia.png cr128-app-pysol.png cr16-app-licq.png crsc-app-aktion.svgz cr16-app-netscape.png cr16-app-kvirc.png Makefile.in cr128-app-linuxconf.png cr16-app-xfmail.png cr32-app-bluefish.png cr48-app-edu_mathematics.png cr48-app-wp.png cr32-app-linguist.png crsc-app-xpaint.svgz crsc-app-browser.svgz cr48-app-xmag.png cr16-app-dlgedit.png cr48-app-xclock.png crsc-app-xchat.svgz cr64-app-package_toys.png cr128-app-wp.png cr64-app-package_utilities.png crsc-app-netscape.svgz cr128-app-package_network.png cr22-app-fifteenpieces.png cr32-app-pybliographic.png cr32-app-pinguin.png cr16-app-designer.png cr32-app-eclipse.png cr64-app-package_games.png cr48-app-emacs.png cr32-app-kfm_home.png cr16-app-penguin.png cr48-app-gnomemeeting.png cr22-app-nedit.png cr22-app-kvirc.png cr32-app-applixware.png cr16-app-pybliographic.png cr16-app-mathematica.png cr16-app-clanbomber.png cr22-app-package_development.png crsc-app-terminal.svgz cr64-app-kfm_home.png cr32-app-xapp.png cr48-app-licq.png cr48-app-xfmail.png cr64-app-applixware.png cr16-app-package_applications.png cr32-app-xload.png cr32-app-package_toys.png cr64-app-tux.png crsc-app-realplayer.svgz cr64-app-package_favourite.png cr16-app-gimp.png crsc-app-quicktime.svgz cr64-app-package.png cr22-app-kbinaryclock.png cr16-app-mozilla_mail.png cr16-app-package_system.png cr16-app-xclock.png cr22-app-email.png cr64-app-kvirc.png cr64-app-wp.png cr32-app-package_games.png cr32-app-wine.png cr32-app-assistant.png cr32-app-randr.png cr32-app-emacs.png cr32-app-edu_languages.png cr32-app-dlgedit.png cr64-app-gvim.png cr32-app-package_development.png crsc-app-fifteenpieces.svgz cr32-app-package_games_board.png cr64-app-penguin.png cr48-app-package_games_board.png cr48-app-remote.png cr48-app-blender.png cr128-app-phppg.png cr16-app-runprocesscatcher.png cr48-app-package_applications.png cr48-app-gvim.png cr16-app-xosview.png cr64-app-nedit.png cr64-app-taskbar.png cr32-app-terminal.png cr16-app-package_application.png cr16-app-package_games.png cr64-app-systemtray.png cr48-app-staroffice.png cr16-app-phppg.png cr48-app-gnucash.png crsc-app-xcalc.svgz cr32-app-package_games_arcade.png cr48-app-mozilla.png cr32-app-phppg.png crsc-app-tux.svgz cr128-app-licq.png cr16-app-package_games_card.png cr16-app-edu_languages.png cr128-app-randr.png cr48-app-package_games.png cr32-app-systemtray.png cr48-app-opera.png cr128-app-terminal.png cr16-app-systemtray.png cr48-app-evolution.png crsc-app-core.svgz crsc-app-display.svgz cr64-app-terminal.png cr16-app-dia.png cr32-app-x.png cr32-app-taskbar.png cr16-app-mozilla.png cr48-app-kfm_home.png cr32-app-clanbomber.png crsc-app-xclock.svgz cr32-app-evolution.png cr32-app-package.png cr48-app-edu_science.png cr32-app-gaim.png cr64-app-gimp.png cr48-app-pan.png cr48-app-xemacs.png cr48-app-package.png cr48-app-pysol.png cr16-app-blender.png cr48-app-designer.png cr48-app-systemtray.png cr64-app-randr.png cr48-app-package_games_strategy.png crsc-app-my_mac.svgz cr32-app-acroread.png cr16-app-evolution.png cr32-app-xeyes.png crsc-app-shell.svgz cr16-app-acroread.png cr48-app-xchat.png cr64-app-package_settings.png cr128-app-email.png cr48-app-planner.png cr128-app-applixware.png cr48-app-vnc.png cr128-app-staroffice.png cr32-app-xcalc.png crsc-app-gnome_apps.svgz cr48-app-mozilla_mail.png cr48-app-applixware.png cr16-app-scribus.png cr16-app-xedit.png cr16-app-gnumeric.png cr48-app-wine.png cr32-app-gv.png cr32-app-package_games_strategy.png cr16-app-gabber.png crsc-app-clock.svgz cr64-app-email.png cr16-app-emacs.png cr16-app-plan.png cr32-app-licq.png cr16-app-gvim.png cr32-app-xfig.png cr16-app-wabi.png cr16-app-linuxconf.png cr32-app-xosview.png cr32-app-package_settings.png cr16-app-email.png cr16-app-lyx.png cr32-app-vnc.png cr48-app-eclipse.png cr128-app-acroread.png cr32-app-xv.png cr48-app-edu_languages.png cr128-app-kfm_home.png crsc-app-email.svgz cr64-app-package_applications.png cr16-app-xpaint.png crsc-app-x.svgz cr32-app-package_edutainment.png crsc-app-camera.svgz cr48-app-randr.png cr16-app-nedit.png cr48-app-abiword.png cr32-app-linuxconf.png cr16-app-gnomemeeting.png cr16-app-xv.png cr32-app-gabber.png cr32-app-package_wordprocessing.png cr128-app-package_toys.png cr48-app-fifteenpieces.png cr16-app-gv.png cr48-app-netscape.png cr64-app-xmag.png cr16-app-package_development.png cr16-app-xemacs.png cr64-app-pysol.png cr16-app-package_games_strategy.png cr48-app-package_network.png crsc-app-package_toys.svgz cr16-app-eclipse.png cr16-app-xeyes.png cr32-app-xpaint.png crsc-app-personal.svgz cr16-app-alevt.png cr48-app-kvirc.png cr128-app-mozilla.png cr16-app-tux.png crsc-app-penguin.svgz cr128-app-systemtray.png cr128-app-gimp.png cr16-app-fifteenpieces.png cr16-app-package_utilities.png cr48-app-bluefish.png cr16-app-kfm_home.png cr32-app-xclock.png cr16-app-vnc.png cr16-app-package_network.png cr32-app-wabi.png cr22-app-taskbar.png cr128-app-clanbomber.png cr22-app-systemtray.png cr48-app-scribus.png cr128-app-tux.png cr32-app-kbinaryclock.png cr32-app-pan.png cr16-app-randr.png crsc-app-galeon.svgz cr32-app-lyx.png cr32-app-opera.png cr22-app-runprocesscatcher.png cr48-app-package_system.png cr48-app-gabber.png cr16-app-xclipboard.png cr48-app-mozilla_m.png cr64-app-xfmail.png cr48-app-gimp.png cr16-app-package_games_arcade.png crsc-app-xeyes.svgz cr32-app-runprocesscatcher.png cr32-app-email.png cr32-app-package_utilities.png cr16-app-gaim.png cr128-app-xmag.png cr48-app-nedit.png cr128-app-penguin.png cr32-app-package_games_card.png cr48-app-package_edutainment.png crsc-app-applixware.svgz cr48-app-package_development.png cr32-app-xmms.png cr48-app-package_toys.png crsc-app-wine.svgz cr32-app-xemacs.png cr32-app-abiword.png cr48-app-gnumeric.png cr16-app-xcalc.png cr16-app-abiword.png cr32-app-package_applications.png cr64-app-xclock.png cr16-app-xmms.png cr64-app-mozilla.png cr32-app-alevt.png cr48-app-email.png cr48-app-package_utilities.png crsc-app-aim.svgz cr32-app-realplayer.png cr32-app-xawtv.png cr48-app-penguin.png cr32-app-package_editors.png cr32-app-nedit.png cr16-app-planner.png cr128-app-netscape.png cr16-app-package.png cr32-app-kvirc.png cr32-app-package_graphics.png cr16-app-package_toys.png cr16-app-xmag.png cr32-app-scribus.png cr48-app-tux.png crsc-app-error.svgz cr32-app-tux.png cr16-app-edu_science.png cr48-app-acroread.png cr128-app-package_favourite.png cr32-app-xconsole.png cr16-app-bluefish.png crsc-app-package_development.svgz cr64-app-qtella.png crsc-app-xapp.svgz cr32-app-gimp.png cr16-app-pan.png cr64-app-staroffice.png cr32-app-mozilla_m.png cr128-app-package_applications.png cr16-app-kbinaryclock.png cr64-app-acroread.png cr48-app-package_graphics.png cr32-app-wp.png crsc-app-download_manager.svgz cr16-app-wp.png cr16-app-package_graphics.png cr32-app-firefox.png cr32-app-galeon.png cr16-app-edu_miscellaneous.png cr48-app-dia.png cr16-app-linguist.png cr32-app-plan.png cr16-app-firefox.png cr128-app-package_settings.png cr48-app-package_editors.png cr48-app-firefox.png cr128-app-package.png cr48-app-phppg.png cr16-app-package_games_board.png cr32-app-gnucash.png cr16-app-edu_mathematics.png cr128-app-xfmail.png cr32-app-pysol.png cr32-app-fifteenpieces.png cr16-app-opera.png cr32-app-package_system.png cr48-app-package_wordprocessing.png crsc-app-acroread.svgz cr32-app-gvim.png cr32-app-dia.png cr32-app-netscape.png cr48-app-edu_miscellaneous.png cr32-app-xfmail.png crsc-app-staroffice.svgz cr64-app-clanbomber.png cr64-app-netscape.png cr48-app-package_games_card.png cr128-app-xclock.png crsc-app-kbinaryclock.svgz cr32-app-package_network.png cr16-app-terminal.png cr32-app-gnome_apps.png Makefile.am cr48-app-taskbar.png cr16-app-xload.png 
  
  #>+ 2
  docs-am:
@@ -101734,21 +121570,122 @@
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-systemtray.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/cr128-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kbinaryclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
@@ -101756,39 +121693,52 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
--	$(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
@@ -101804,84 +121754,35 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-fifteenpieces.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-pinguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
@@ -101891,145 +121792,209 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
 +	$(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xchat.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-antivirus.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
--	$(INSTALL_DATA) $(srcdir)/crsc-app-kfm_home.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-kfm_home.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-wine.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-galeon.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
- 	$(INSTALL_DATA) $(srcdir)/cr64-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_m.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
--	$(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-package_development.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-pinguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-kbinaryclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-aim.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-fifteenpieces.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
@@ -102038,7 +122003,11 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-clock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
@@ -102046,92 +122015,67 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xeyes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gaim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-display.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-realplayer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-lyx.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xosview.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xapp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
--	$(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-xpaint.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_application.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-alevt.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
@@ -102147,7 +122091,12 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
--	$(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
@@ -102170,59 +122119,14 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-acroread.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-tux.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-x.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-kbinaryclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xeyes.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xcalc.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
@@ -102236,42 +122140,14 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-personal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_strategy.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-kfm_home.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-systemtray.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-openoffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xpaint.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-linguist.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
@@ -102282,9 +122158,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
@@ -102315,31 +122189,24 @@
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-qtella.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-blender.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-browser.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
  	$(INSTALL_DATA) $(srcdir)/cr32-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-runprocesscatcher.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-core.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-vnc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-email.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
++	$(INSTALL_DATA) $(srcdir)/crsc-app-terminal.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-xmag.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
--	$(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
@@ -102359,20 +122226,7 @@
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-my_mac.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-pybliographic.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-error.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gnumeric.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_mathematics.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-scribus.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-shell.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
@@ -102384,24 +122238,33 @@
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-staroffice.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-pan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-nedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-wabi.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_editors.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-xclipboard.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-penguin.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-xmms.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gnomemeeting.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-systemtray.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-galeon.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-xcalc.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-xfig.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-package_settings.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
@@ -102410,24 +122273,12 @@
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-pysol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-clanbomber.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xconsole.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-dlgedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-download_manager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_miscellaneous.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-linuxconf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-edu_science.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-xload.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-aktion.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-xchat.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-kbinaryclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
@@ -102437,42 +122288,22 @@
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-netscape.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-package_toys.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-clanbomber.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_card.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-xapp.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gnome_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
 +	$(INSTALL_DATA) $(srcdir)/cr22-app-package_development.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gnucash.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-gnome_apps.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-gabber.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-xedit.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-emacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-edu_languages.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-package_wordprocessing.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
--	$(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-dia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
 -	$(INSTALL_DATA) $(srcdir)/cr128-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-opera.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-applixware.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-terminal.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
++	$(INSTALL_DATA) $(srcdir)/cr32-app-acroread.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-xawtv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-xclock.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-wp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
@@ -102481,18 +122312,36 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-sodipodi.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
 -	$(INSTALL_DATA) $(srcdir)/cr64-app-package_games.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-x.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-eclipse.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_graphics.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-penguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-quicktime.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
++	$(INSTALL_DATA) $(srcdir)/cr48-app-remote.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-firefox.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-evolution.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_arcade.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-licq.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-package_edutainment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_favourite.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-hardware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
++	$(INSTALL_DATA) $(srcdir)/cr16-app-thunderbird.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-xclock.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-fifteenpieces.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-designer.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_network.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-randr.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-package_multimedia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-xfmail.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-phppg.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla_mail.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-tux.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-mathematica.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-package_games_board.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-kvirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-wmaker_apps.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-app-taskbar.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-realplayer.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-xemacs.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
@@ -102508,20 +122357,11 @@
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
 -	$(INSTALL_DATA) $(srcdir)/cr48-app-package_system.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
 -	$(INSTALL_DATA) $(srcdir)/cr32-app-pinguin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-email.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-wine.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-plan.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-bluefish.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-package_toys.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-assistant.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-planner.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gimp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kfm_home.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-gvim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-abiword.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
-+	$(INSTALL_DATA) $(srcdir)/cr128-app-staroffice.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-xv.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-netscape.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
++	$(INSTALL_DATA) $(srcdir)/crsc-app-camera.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
++	$(INSTALL_DATA) $(srcdir)/cr128-app-systemtray.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_utilities.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-package_applications.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
  
  uninstall-kde-icons:
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
@@ -102533,10 +122373,107 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
@@ -102544,34 +122481,52 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gimp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
@@ -102587,83 +122542,35 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_arcade.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/tux.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_science.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xfmail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_edutainment.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clock.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/lyx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pan.png
@@ -102676,105 +122583,55 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/phppg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmag.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gaim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/eclipse.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/antivirus.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_wordprocessing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gv.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_multimedia.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_mathematics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wabi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/fifteenpieces.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/netscape.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xpaint.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_m.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/assistant.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/tux.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnome_apps.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/wine.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/clanbomber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/galeon.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/clanbomber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kfm_home.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnumeric.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/bluefish.png
@@ -102783,29 +122640,26 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/staroffice.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/designer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/nedit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kvirc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclipboard.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/opera.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
@@ -102813,7 +122667,14 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_m.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_strategy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/terminal.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/phppg.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
@@ -102828,12 +122689,7 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/licq.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kvirc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
@@ -102845,74 +122701,54 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xeyes.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/vnc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gv.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/blender.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xemacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/display.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/runprocesscatcher.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/realplayer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xload.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linguist.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xosview.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/emacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/sodipodi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/penguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/firefox.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xv.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_m.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xapp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
@@ -102941,75 +122777,120 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnumeric.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/tux.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/wp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/realplayer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/phppg.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pan.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnucash.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mathematica.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/sodipodi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_development.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/vnc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/nedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/acroread.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/tux.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/designer.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/netscape.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/runprocesscatcher.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/x.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_edutainment.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/penguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xmms.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/gimp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_development.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_miscellaneous.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_development.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kbinaryclock.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gimp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xeyes.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_science.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xcalc.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla_mail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gimp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/linuxconf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kbinaryclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/netscape.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_network.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/linuxconf.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_graphics.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/scribus.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/dia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/eclipse.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_strategy.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/penguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xosview.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/wp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kvirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wine.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnome_apps.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_settings.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/alevt.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_miscellaneous.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/pysol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aim.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_applications.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/fifteenpieces.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/mozilla.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/galeon.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/emacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xmag.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_editors.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/blender.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/scribus.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xedit.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
@@ -103018,11 +122899,7 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnucash.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_utilities.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_mathematics.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
@@ -103036,37 +122913,40 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xeyes.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/evolution.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_strategy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kfm_home.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/applixware.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/firefox.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xcalc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gaim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xchat.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/lyx.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/clanbomber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_card.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kbinaryclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/terminal.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/applixware.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/opera.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_arcade.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/acroread.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gaim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xpaint.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_application.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/systemtray.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_development.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/abiword.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kfm_home.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/penguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_favourite.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kbinaryclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/openoffice.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xpaint.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfig.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linguist.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xconsole.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kfm_home.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xchat.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/planner.png
@@ -103074,55 +122954,45 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/acroread.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xchat.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/linuxconf.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/randr.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_applications.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xfmail.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_editors.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_favourite.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/qtella.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/mozilla.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_settings.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/terminal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_graphics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/blender.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/browser.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xmag.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gabber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/alevt.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/personal.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/nedit.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/pysol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_wordprocessing.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_favourite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/pybliographic.png
  	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/runprocesscatcher.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gabber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnomemeeting.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/core.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/vnc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/abiword.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/bluefish.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/email.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/terminal.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xmag.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_development.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/linuxconf.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_network.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_applications.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/clanbomber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/thunderbird.png
@@ -103142,20 +123012,7 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_utilities.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/my_mac.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pybliographic.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/edu_languages.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/error.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnumeric.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_mathematics.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/email.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/scribus.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/shell.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/systemtray.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_favourite.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/remote.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xv.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_development.png
@@ -103167,24 +123024,33 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/staroffice.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dlgedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_languages.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_card.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/nedit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/mozilla_mail.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_toys.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wabi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/acroread.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_editors.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnomemeeting.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/xfmail.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xclipboard.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/plan.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/penguin.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xmms.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gnomemeeting.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/gvim.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_toys.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/fifteenpieces.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/systemtray.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_system.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/pysol.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/galeon.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xcalc.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfig.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_system.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_settings.png
@@ -103193,24 +123059,12 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pysol.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/clanbomber.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xconsole.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/dlgedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/download_manager.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/evolution.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_miscellaneous.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/linuxconf.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/edu_science.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xload.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/aktion.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/applixware.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xchat.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/fifteenpieces.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kbinaryclock.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/phppg.png
@@ -103220,42 +123074,22 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/netscape.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/netscape.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/taskbar.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/package_toys.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/clanbomber.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/email.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/randr.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gvim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_card.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_games.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xapp.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gnome_apps.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/gvim.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mozilla.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/package_development.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gnucash.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/gnome_apps.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/acroread.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/gabber.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/licq.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xedit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/emacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/planner.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_multimedia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/edu_languages.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_wordprocessing.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/systemtray.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/staroffice.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_utilities.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/dia.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_toys.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/opera.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/applixware.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/terminal.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/acroread.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xawtv.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/xclock.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/wp.png
@@ -103264,18 +123098,36 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/sodipodi.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/package_games.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_games_board.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/x.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/eclipse.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/taskbar.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_graphics.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/penguin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/quicktime.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/remote.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/firefox.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/package_multimedia.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/evolution.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_arcade.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_games_board.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/licq.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_edutainment.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_favourite.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/hardware.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/thunderbird.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/xclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/fifteenpieces.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/designer.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_network.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/randr.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_multimedia.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kvirc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xfmail.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/phppg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla_mail.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/tux.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/xemacs.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/mathematica.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wine.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_games_board.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kvirc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/email.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/wmaker_apps.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/taskbar.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/realplayer.svgz
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/xemacs.png
@@ -103291,20 +123143,11 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_applications.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/package_system.png
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/pinguin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/email.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/wine.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/plan.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/bluefish.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/package_toys.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/assistant.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/planner.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kfm_home.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gimp.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kfm_home.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/gvim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/abiword.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/staroffice.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/xv.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/netscape.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_utilities.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/package_applications.png
  
  #>+ 15
  force-reedit:
@@ -103318,7 +123161,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -267,6 +268,9 @@
+@@ -217,7 +218,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103328,7 +123179,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -317,6 +321,7 @@
+@@ -317,6 +320,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -103336,7 +123187,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -324,12 +329,9 @@
+@@ -324,12 +328,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -103349,7 +123200,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -350,10 +352,13 @@
+@@ -350,10 +351,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -103363,7 +123214,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -362,6 +367,7 @@
+@@ -362,6 +366,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -103371,7 +123222,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -523,6 +529,7 @@
+@@ -523,6 +528,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -103379,7 +123230,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -530,10 +537,12 @@
+@@ -530,10 +536,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -103392,7 +123243,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -559,7 +568,7 @@
+@@ -559,7 +567,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -103401,7 +123252,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +606,9 @@
+@@ -597,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103423,7 +123274,15 @@
  HALBACKEND = @HALBACKEND@
  HAL_CFLAGS = @HAL_CFLAGS@
  HAL_INCS = @HAL_INCS@
-@@ -261,6 +262,9 @@
+@@ -211,7 +212,6 @@
+ LIBTOOL = @LIBTOOL@
+ LIBUCB = @LIBUCB@
+ LIBUSBCONFIG = @LIBUSBCONFIG@
+-LIBUTEMPTER = @LIBUTEMPTER@
+ LIBUTIL = @LIBUTIL@
+ LIBXDMCP = @LIBXDMCP@
+ LIBXFT_LIB = @LIBXFT_LIB@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -103433,7 +123292,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -311,6 +315,7 @@
+@@ -311,6 +314,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -103441,7 +123300,7 @@
  XMLLINT = @XMLLINT@
  XTESTLIB = @XTESTLIB@
  X_EXTRA_LIBS = @X_EXTRA_LIBS@
-@@ -318,12 +323,9 @@
+@@ -318,12 +322,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -103454,7 +123313,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -344,10 +346,13 @@
+@@ -344,10 +345,13 @@
  build_os = @build_os@
  build_vendor = @build_vendor@
  datadir = @datadir@
@@ -103468,7 +123327,7 @@
  exec_prefix = @exec_prefix@
  have_xcursor_FALSE = @have_xcursor_FALSE@
  have_xcursor_TRUE = @have_xcursor_TRUE@
-@@ -356,6 +361,7 @@
+@@ -356,6 +360,7 @@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -103476,7 +123335,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_BZIP2_FALSE = @include_BZIP2_FALSE@
-@@ -517,6 +523,7 @@
+@@ -517,6 +522,7 @@
  libexecdir = @libexecdir@
  libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
  libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
@@ -103484,7 +123343,7 @@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
-@@ -524,10 +531,12 @@
+@@ -524,10 +530,12 @@
  nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
  nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
  oldincludedir = @oldincludedir@
@@ -103497,7 +123356,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -606,7 +615,7 @@
+@@ -606,7 +614,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -103506,7 +123365,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +653,9 @@
+@@ -644,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -103518,12 +123377,3 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -806,7 +815,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=sunshine-after-the-rain.jpg andes-venezolanos.svgz All-Good-People-1.jpg.desktop soft-green.jpg Won-Ton-Soup-3.jpg lineart.svgz CREDITS konqui.svgz moon.svgz.desktop soft-green.jpg.desktop triplegears.jpg Time-For-Lunch-2.jpg seaofconero.jpg Makefile.in triplegears.jpg.desktop celtic.svgz.desktop andes-venezolanos.svgz.desktop aurora.svgz.desktop Totally-New-Product-1.jpg globe.svgz.desktop default_gears.jpg.desktop Chicken-Songs-2.jpg.desktop floating-leaves.jpg stelvio.jpg.desktop default_gears.jpg Time-For-Lunch-2.jpg.desktop here-gear.svgz blue-bend.jpg Won-Ton-Soup-3.jpg.desktop alta-badia.jpg.desktop alta-badia.jpg No-Ones-Laughing-3.jpg.desktop celtic.svgz default_blue.jpg moon.svgz blue-bend.jpg.desktop konqui.svgz.desktop default_blue.jpg.desktop seaofconero.jpg.desktop KDE34.png aurora.svgz globe.svgz All-Good-People-1.jpg Chicken-Songs-2.jpg here-gear.svgz.desktop lineart.svgz.desktop floating-leaves.jpg.desktop sunshine-after-the-rain.jpg.desktop stelvio.jpg Totally-New-Product-1.jpg.desktop No-Ones-Laughing-3.jpg Makefile.am KDE34.png.desktop 
-+KDE_DIST=sunshine-after-the-rain.jpg andes-venezolanos.svgz All-Good-People-1.jpg.desktop soft-green.jpg Won-Ton-Soup-3.jpg lineart.svgz CREDITS konqui.svgz moon.svgz.desktop soft-green.jpg.desktop triplegears.jpg Time-For-Lunch-2.jpg seaofconero.jpg Makefile.in triplegears.jpg.desktop celtic.svgz.desktop andes-venezolanos.svgz.desktop aurora.svgz.desktop Totally-New-Product-1.jpg globe.svgz.desktop default_gears.jpg.desktop Chicken-Songs-2.jpg.desktop floating-leaves.jpg stelvio.jpg.desktop default_gears.jpg Time-For-Lunch-2.jpg.desktop here-gear.svgz blue-bend.jpg Won-Ton-Soup-3.jpg.desktop alta-badia.jpg.desktop alta-badia.jpg No-Ones-Laughing-3.jpg.desktop celtic.svgz default_blue.jpg moon.svgz blue-bend.jpg.desktop konqui.svgz.desktop default_blue.jpg.desktop seaofconero.jpg.desktop KDE34.png aurora.svgz globe.svgz All-Good-People-1.jpg Chicken-Songs-2.jpg here-gear.svgz.desktop lineart.svgz.desktop floating-leaves.jpg.desktop stelvio.jpg sunshine-after-the-rain.jpg.desktop Totally-New-Product-1.jpg.desktop No-Ones-Laughing-3.jpg Makefile.am KDE34.png.desktop 
- 
- #>+ 2
- docs-am:




More information about the pkg-kde-commits mailing list