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

Christopher Martin chrsmrtn at costa.debian.org
Fri Jan 27 19:13:11 UTC 2006


Author: chrsmrtn
Date: 2006-01-27 19:12:54 +0000 (Fri, 27 Jan 2006)
New Revision: 3003

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


Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/98_buildprep.diff	2006-01-27 19:12:27 UTC (rev 3002)
+++ trunk/packages/kdebase/debian/patches/98_buildprep.diff	2006-01-27 19:12:54 UTC (rev 3003)
@@ -1,76 +1,5 @@
 #DPATCHLEVEL=0
 # vi: ft=diff
---- Makefile.in
-+++ Makefile.in
-@@ -186,6 +186,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -288,6 +289,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -438,6 +442,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -589,7 +595,7 @@
- .SUFFIXES:
- am--refresh:
- 	@:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -631,12 +637,12 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- #>- 	cd $(srcdir) && $(AUTOCONF)
- #>+ 2
- 	cd $(srcdir) && rm -f configure
- 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- 
- config.h: stamp-h1
-@@ -648,7 +654,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in:  $(am__configure_deps) 
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
- 	cd $(top_srcdir) && $(AUTOHEADER)
- 	rm -f stamp-h1
- 	touch $@
-@@ -1185,7 +1191,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=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:
 --- acinclude.m4
 +++ acinclude.m4
 @@ -1689,15 +1689,6 @@
@@ -2942,17 +2871,47 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- applnk/Makefile.in
-+++ applnk/Makefile.in
-@@ -177,6 +177,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -279,6 +280,9 @@
+--- 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
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2962,26 +2921,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,6 +433,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -566,7 +572,7 @@
- SUBDIRS = compat
- xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
- xdg_mergedmenu_DATA = kde-essential.menu
--xdg_mergedmenudir = $(xdg_menudir)/applications-merged
-+xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
- xdg_directory_DATA = \
- kde-main.directory \
- kde-development.directory \
-@@ -621,7 +627,7 @@
- all: docs-am  all-recursive
+@@ -560,7 +563,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -2989,7 +2930,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -659,9 +665,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3001,26 +2942,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -1024,7 +1030,7 @@
+@@ -760,7 +763,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-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 
+-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/compat/Makefile.in
-+++ applnk/compat/Makefile.in
-@@ -160,6 +160,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -262,6 +263,9 @@
+--- applnk/Makefile.in
++++ applnk/Makefile.in
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3030,17 +2963,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -412,6 +416,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -557,7 +563,7 @@
- all: docs-am  all-am
+@@ -569,7 +572,7 @@
+ SUBDIRS = compat
+ xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
+ xdg_mergedmenu_DATA = kde-essential.menu
+-xdg_mergedmenudir = $(xdg_menudir)/applications-merged
++xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
+ xdg_directory_DATA = \
+ kde-main.directory \
+ kde-development.directory \
+@@ -624,7 +627,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -3048,7 +2981,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -662,9 +665,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3060,27 +2993,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -757,7 +763,7 @@
+@@ -1027,7 +1030,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 
+-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-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:
---- config.h.in
-+++ config.h.in
-@@ -689,6 +689,9 @@
- /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
- #undef TIME_WITH_SYS_TIME
- 
-+/* Path for the usb.ids file to use */
-+#undef USBIDS_FILE
-+
- /* Define if kdm should use shadow passwords */
- #undef USESHADOW
- 
 --- configure
 +++ configure
 @@ -278,15 +278,15 @@
@@ -3106,7 +3027,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_ARTS ARTS_CFLAGS LIB_KVM LIB_XCOMPOSITE LIB_XFIXES SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIB_LBER LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING PKG_CONFIG HAL_CFLAGS HAL_LIBS HAL_INCS DBUS_CFLAGS DBUS_LIBS DBUS_INCS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE include_media_halbackend_TRUE include_media_halbackend_FALSE SMBCLIENT_EXTRA_LIBS include_kioslave_smb_TRUE include_kioslave_smb_FALSE LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBHOSTS LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdeeject_SUBDIR_included_TRUE kdeeject_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE install_usbids_TRUE install_usbids_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_ARTS ARTS_CFLAGS KHOTKEYS_ARTS_SUBDIR LIB_KVM LIB_XCOMPOSITE LIB_XFIXES SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIB_LBER LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING PKG_CONFIG HAL_CFLAGS HAL_LIBS HAL_INCS DBUS_CFLAGS DBUS_LIBS DBUS_INCS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE include_media_halbackend_TRUE include_media_halbackend_FALSE SMBCLIENT_EXTRA_LIBS include_kioslave_smb_TRUE include_kioslave_smb_FALSE LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBHOSTS LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdeeject_SUBDIR_included_TRUE kdeeject_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE install_usbids_TRUE install_usbids_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_ARTS ARTS_CFLAGS KHOTKEYS_ARTS_SUBDIR LIB_KVM LIB_XCOMPOSITE LIB_XFIXES SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LIB_LBER LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING PKG_CONFIG HAL_CFLAGS HAL_LIBS HAL_INCS DBUS_CFLAGS DBUS_LIBS DBUS_INCS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE include_media_halbackend_TRUE include_media_halbackend_FALSE SMBCLIENT_EXTRA_LIBS include_kioslave_smb_TRUE include_kioslave_smb_FALSE LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBHOSTS LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIB_DNSSD HAVE_DNSSD_TRUE HAVE_DNSSD_FALSE include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdeeject_SUBDIR_included_TRUE kdeeject_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
@@ -3120,16 +3041,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
-@@ -1093,6 +1095,8 @@
-   --without-gl            disable 3D GL modes
-   --with-libusb           enable control of some mouse models through libusb
-                           [default=check]
-+  --with-usbids=PATH      Use the usb.ids file at the specified path, instead
-+                          of the local copy
-   --with-libraw1394       enable visualization of ieee1394 devices through
-                           libraw1394 [default=check]
-   --without-xdmcp         build kdm without xdmcp support
-@@ -1213,7 +1217,7 @@
+@@ -1218,7 +1220,7 @@
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
@@ -3138,7 +3050,7 @@
    done
  fi
  
-@@ -2116,6 +2120,31 @@
+@@ -2121,6 +2123,31 @@
  
  
  
@@ -3170,7 +3082,7 @@
  
    unset CDPATH
  
-@@ -3049,8 +3078,7 @@
+@@ -3054,8 +3081,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3180,7 +3092,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3108,8 +3136,7 @@
+@@ -3113,8 +3139,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3190,7 +3102,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3225,8 +3252,7 @@
+@@ -3230,8 +3255,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3200,7 +3112,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3280,8 +3306,7 @@
+@@ -3285,8 +3309,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3210,7 +3122,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3326,8 +3351,7 @@
+@@ -3331,8 +3354,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3220,7 +3132,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3371,8 +3395,7 @@
+@@ -3376,8 +3398,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3230,7 +3142,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3929,8 +3952,7 @@
+@@ -3934,8 +3955,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3240,7 +3152,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3988,8 +4010,7 @@
+@@ -3993,8 +4013,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3250,7 +3162,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4060,8 +4081,7 @@
+@@ -4065,8 +4084,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3260,7 +3172,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4105,8 +4125,7 @@
+@@ -4110,8 +4128,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3270,7 +3182,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4284,8 +4303,7 @@
+@@ -4289,8 +4306,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3280,7 +3192,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4396,8 +4414,7 @@
+@@ -4401,8 +4417,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3290,7 +3202,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4485,8 +4502,7 @@
+@@ -4490,8 +4505,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3300,7 +3212,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4588,8 +4604,7 @@
+@@ -4593,8 +4607,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3310,7 +3222,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4688,8 +4703,7 @@
+@@ -4693,8 +4706,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3320,7 +3232,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4773,8 +4787,7 @@
+@@ -4778,8 +4790,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3330,7 +3242,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4863,8 +4876,7 @@
+@@ -4868,8 +4879,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3340,7 +3252,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4951,8 +4963,7 @@
+@@ -4956,8 +4966,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3350,7 +3262,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5039,8 +5050,7 @@
+@@ -5044,8 +5053,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3360,7 +3272,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5146,8 +5156,7 @@
+@@ -5151,8 +5159,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3370,7 +3282,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5234,8 +5243,7 @@
+@@ -5239,8 +5246,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3380,7 +3292,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5322,8 +5330,7 @@
+@@ -5327,8 +5333,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3390,7 +3302,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5410,8 +5417,7 @@
+@@ -5415,8 +5420,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3400,7 +3312,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5542,8 +5548,7 @@
+@@ -5547,8 +5551,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3410,7 +3322,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5631,8 +5636,7 @@
+@@ -5636,8 +5639,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3420,7 +3332,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5719,8 +5723,7 @@
+@@ -5724,8 +5726,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3430,7 +3342,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5807,8 +5810,7 @@
+@@ -5812,8 +5813,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3440,7 +3352,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5895,8 +5897,7 @@
+@@ -5900,8 +5900,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3450,7 +3362,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5983,8 +5984,7 @@
+@@ -5988,8 +5987,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3460,7 +3372,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6407,8 +6407,7 @@
+@@ -6412,8 +6410,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3470,7 +3382,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6534,8 +6533,7 @@
+@@ -6539,8 +6536,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3480,7 +3392,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6623,8 +6621,7 @@
+@@ -6628,8 +6624,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3490,7 +3402,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6707,185 +6704,6 @@
+@@ -6712,185 +6707,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -3676,7 +3588,7 @@
    fi
  
  
-@@ -7049,7 +6867,7 @@
+@@ -7054,7 +6870,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
@@ -3685,7 +3597,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7154,7 +6972,7 @@
+@@ -7159,7 +6975,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,
@@ -3694,7 +3606,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'*)
-@@ -7188,7 +7006,7 @@
+@@ -7193,7 +7009,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -3703,7 +3615,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7218,6 +7036,15 @@
+@@ -7223,6 +7039,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -3719,7 +3631,7 @@
  
  echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
  echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7304,44 +7131,36 @@
+@@ -7309,44 +7134,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -3774,7 +3686,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7357,7 +7176,7 @@
+@@ -7362,7 +7179,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -3783,7 +3695,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
-@@ -7374,42 +7193,21 @@
+@@ -7379,42 +7196,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -3833,7 +3745,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
-@@ -7428,19 +7226,14 @@
+@@ -7433,19 +7229,14 @@
    ;;
  
  openbsd*)
@@ -3855,7 +3767,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7450,7 +7243,6 @@
+@@ -7455,7 +7246,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -3863,16 +3775,16 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7527,7 +7319,7 @@
+@@ -7532,7 +7322,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7530 "configure"' > conftest.$ac_ext
-+  echo '#line 7322 "configure"' > conftest.$ac_ext
+-  echo '#line 7535 "configure"' > conftest.$ac_ext
++  echo '#line 7325 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7570,14 +7362,13 @@
+@@ -7575,14 +7365,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -3889,7 +3801,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7589,7 +7380,6 @@
+@@ -7594,7 +7383,6 @@
        esac
        ;;
      *64-bit*)
@@ -3897,7 +3809,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7649,8 +7439,7 @@
+@@ -7654,8 +7442,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3907,7 +3819,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7725,8 +7514,7 @@
+@@ -7730,8 +7517,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3917,7 +3829,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7896,8 +7684,7 @@
+@@ -7901,8 +7687,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3927,7 +3839,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7964,8 +7751,7 @@
+@@ -7969,8 +7754,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -3937,7 +3849,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8080,6 +7866,243 @@
+@@ -8085,6 +7869,243 @@
  
  done
  
@@ -4181,16 +4093,16 @@
  ac_ext=f
  ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
  ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8172,7 +8195,7 @@
+@@ -8177,7 +8198,7 @@
  
  
  # Provide some information about the compiler.
--echo "$as_me:8175:" \
-+echo "$as_me:8198:" \
+-echo "$as_me:8180:" \
++echo "$as_me:8201:" \
       "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
-@@ -8218,8 +8241,7 @@
+@@ -8223,8 +8244,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4200,7 +4112,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8268,8 +8290,7 @@
+@@ -8273,8 +8293,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4210,7 +4122,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8327,7 +8348,7 @@
+@@ -8332,7 +8351,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -4219,7 +4131,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8356,20 +8377,53 @@
+@@ -8361,20 +8380,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -4279,7 +4191,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.
-@@ -8406,9 +8460,6 @@
+@@ -8411,9 +8463,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -4289,7 +4201,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'"
  
-@@ -8430,6 +8481,13 @@
+@@ -8435,6 +8484,13 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -4303,7 +4215,7 @@
  irix* | nonstopux*)
    symcode='[BCDEGRST]'
    ;;
-@@ -8437,7 +8495,7 @@
+@@ -8442,7 +8498,7 @@
    symcode='[BCDEGQRST]'
    ;;
  solaris* | sysv5*)
@@ -4312,7 +4224,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8455,14 +8513,17 @@
+@@ -8460,14 +8516,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -4332,7 +4244,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8624,7 +8685,7 @@
+@@ -8629,7 +8688,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -4341,7 +4253,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8644,7 +8705,7 @@
+@@ -8649,7 +8708,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -4350,7 +4262,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8929,6 +8990,17 @@
+@@ -8934,6 +8993,17 @@
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -4368,7 +4280,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -8954,7 +9026,7 @@
+@@ -8959,7 +9029,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -4377,7 +4289,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
-@@ -9016,7 +9088,7 @@
+@@ -9021,7 +9091,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -4386,7 +4298,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
-@@ -9115,6 +9187,20 @@
+@@ -9120,6 +9190,20 @@
  compiler=$CC
  
  
@@ -4407,7 +4319,7 @@
  #
  # Check for any special shared library compilation flags.
  #
-@@ -9151,11 +9237,16 @@
+@@ -9156,11 +9240,16 @@
     LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -4425,7 +4337,7 @@
       else
         lt_prog_compiler_static_works=yes
       fi
-@@ -9201,18 +9292,20 @@
+@@ -9206,18 +9295,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -4433,13 +4345,13 @@
 +   -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:9207: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9298: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9212: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9301: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9211: \$? = $ac_status" >&5
-+   echo "$as_me:9302: \$? = $ac_status" >&5
+-   echo "$as_me:9216: \$? = $ac_status" >&5
++   echo "$as_me:9305: \$? = $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
@@ -4451,7 +4363,7 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -9289,7 +9382,7 @@
+@@ -9294,7 +9385,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -4460,7 +4372,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9315,6 +9408,16 @@
+@@ -9320,6 +9411,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -4477,7 +4389,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9326,7 +9429,7 @@
+@@ -9331,7 +9432,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.
@@ -4486,7 +4398,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9350,12 +9453,19 @@
+@@ -9355,12 +9456,19 @@
        ;;
  
      linux*)
@@ -4507,7 +4419,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9376,9 +9486,14 @@
+@@ -9381,9 +9489,14 @@
        ;;
  
      solaris*)
@@ -4523,7 +4435,7 @@
        ;;
  
      sunos4*)
-@@ -9400,6 +9515,11 @@
+@@ -9405,6 +9518,11 @@
        fi
        ;;
  
@@ -4535,7 +4447,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9434,18 +9554,20 @@
+@@ -9439,18 +9557,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -4543,13 +4455,13 @@
 +   -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:9440: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9560: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9445: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9563: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9444: \$? = $ac_status" >&5
-+   echo "$as_me:9564: \$? = $ac_status" >&5
+-   echo "$as_me:9449: \$? = $ac_status" >&5
++   echo "$as_me:9567: \$? = $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
@@ -4561,7 +4473,7 @@
         lt_prog_compiler_pic_works=yes
       fi
     fi
-@@ -9466,7 +9588,7 @@
+@@ -9471,7 +9591,7 @@
  fi
  
  fi
@@ -4570,7 +4482,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9488,38 +9610,36 @@
+@@ -9493,38 +9613,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -4591,13 +4503,13 @@
 +   -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:9507: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9622: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9512: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9625: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9511: \$? = $ac_status" >&5
-+   echo "$as_me:9626: \$? = $ac_status" >&5
+-   echo "$as_me:9516: \$? = $ac_status" >&5
++   echo "$as_me:9629: \$? = $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
@@ -4621,7 +4533,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9590,6 +9710,16 @@
+@@ -9595,6 +9713,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -4638,7 +4550,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9610,6 +9740,27 @@
+@@ -9615,6 +9743,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -4666,7 +4578,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9647,7 +9798,7 @@
+@@ -9652,7 +9801,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -4675,7 +4587,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9657,13 +9808,13 @@
+@@ -9662,13 +9811,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'
@@ -4692,18 +4604,17 @@
  	# 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
-@@ -9672,19 +9823,51 @@
+@@ -9677,19 +9826,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
 -	$CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
 +	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
- 	ld_shlibs=no
-       fi
-       ;;
- 
--    netbsd*)
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
 +    linux*)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
@@ -4731,11 +4642,12 @@
 +	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +	fi
 +	link_all_deplibs=no
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -4748,7 +4660,7 @@
        fi
        ;;
  
-@@ -9702,8 +9885,8 @@
+@@ -9707,8 +9888,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4759,7 +4671,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9718,24 +9901,19 @@
+@@ -9723,24 +9904,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -4791,7 +4703,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9769,9 +9947,20 @@
+@@ -9774,9 +9950,20 @@
  	else
  	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -4814,7 +4726,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9788,7 +9977,7 @@
+@@ -9793,7 +9980,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -4823,7 +4735,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`
-@@ -9809,6 +9998,9 @@
+@@ -9814,6 +10001,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -4833,7 +4745,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9817,21 +10009,22 @@
+@@ -9822,21 +10012,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -4861,7 +4773,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9855,8 +10048,7 @@
+@@ -9860,8 +10051,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4871,7 +4783,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9883,14 +10075,13 @@
+@@ -9888,14 +10078,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -4889,7 +4801,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -9917,8 +10108,7 @@
+@@ -9922,8 +10111,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -4899,7 +4811,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9955,8 +10145,8 @@
+@@ -9960,8 +10148,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec=' '
  	  archive_cmds_need_lc=yes
@@ -4910,7 +4822,7 @@
  	fi
        fi
        ;;
-@@ -9969,7 +10159,7 @@
+@@ -9974,7 +10162,7 @@
        ld_shlibs=no
        ;;
  
@@ -4919,7 +4831,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -9979,13 +10169,13 @@
+@@ -9984,13 +10172,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -4936,7 +4848,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.
-@@ -9995,52 +10185,52 @@
+@@ -10000,52 +10188,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -5029,7 +4941,7 @@
      fi
        ;;
  
-@@ -10074,8 +10264,8 @@
+@@ -10079,8 +10267,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -5040,7 +4952,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10083,7 +10273,7 @@
+@@ -10088,7 +10276,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -5049,7 +4961,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
-@@ -10099,16 +10289,16 @@
+@@ -10104,16 +10292,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -5070,7 +4982,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -10118,7 +10308,7 @@
+@@ -10123,7 +10311,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -5079,7 +4991,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10151,7 +10341,7 @@
+@@ -10156,7 +10344,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -5088,7 +5000,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'
-@@ -10161,7 +10351,7 @@
+@@ -10166,7 +10354,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -5097,7 +5009,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10184,7 +10374,8 @@
+@@ -10189,7 +10377,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
@@ -5107,7 +5019,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10194,7 +10385,7 @@
+@@ -10199,7 +10388,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -5116,7 +5028,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10205,14 +10396,14 @@
+@@ -10210,14 +10399,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -5133,7 +5045,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'
-@@ -10224,13 +10415,13 @@
+@@ -10229,13 +10418,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -5149,7 +5061,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10249,10 +10440,12 @@
+@@ -10254,10 +10443,12 @@
      solaris*)
        no_undefined_flag=' -z text'
        if test "$GCC" = yes; then
@@ -5164,7 +5076,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'
-@@ -10261,8 +10454,18 @@
+@@ -10266,8 +10457,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -5185,7 +5097,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10271,7 +10474,7 @@
+@@ -10276,7 +10477,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.
@@ -5194,7 +5106,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10331,9 +10534,9 @@
+@@ -10336,9 +10537,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -5206,7 +5118,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var=no
-@@ -10439,7 +10642,7 @@
+@@ -10444,7 +10645,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -5215,7 +5127,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10449,7 +10652,20 @@
+@@ -10454,7 +10655,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5237,7 +5149,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10514,7 +10730,7 @@
+@@ -10519,7 +10733,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -5246,7 +5158,7 @@
    ;;
  
  beos*)
-@@ -10523,7 +10739,7 @@
+@@ -10528,7 +10742,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -5255,7 +5167,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10539,7 +10755,7 @@
+@@ -10544,7 +10758,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -5264,7 +5176,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10551,7 +10767,8 @@
+@@ -10556,7 +10770,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -5274,7 +5186,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10581,7 +10798,7 @@
+@@ -10586,7 +10801,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -5283,7 +5195,7 @@
        ;;
      esac
      ;;
-@@ -10604,7 +10821,7 @@
+@@ -10609,7 +10824,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -5292,7 +5204,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"`
-@@ -10627,7 +10844,7 @@
+@@ -10632,7 +10847,7 @@
    dynamic_linker=no
    ;;
  
@@ -5301,7 +5213,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10639,8 +10856,17 @@
+@@ -10644,8 +10859,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -5321,7 +5233,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10658,7 +10884,7 @@
+@@ -10663,7 +10887,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -5330,7 +5242,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -10685,9 +10911,9 @@
+@@ -10690,9 +10914,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -5342,7 +5254,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10702,7 +10928,7 @@
+@@ -10707,7 +10931,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -5351,7 +5263,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10713,7 +10939,7 @@
+@@ -10718,7 +10942,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -5360,7 +5272,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10775,22 +11001,19 @@
+@@ -10780,22 +11004,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -5389,7 +5301,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,
-@@ -10800,6 +11023,30 @@
+@@ -10805,6 +11026,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -5420,7 +5332,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10809,7 +11056,7 @@
+@@ -10814,7 +11059,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -5429,7 +5341,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10838,7 +11085,11 @@
+@@ -10843,7 +11088,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -5442,7 +5354,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
-@@ -10858,7 +11109,7 @@
+@@ -10863,7 +11112,7 @@
  
  os2*)
    libname_spec='$name'
@@ -5451,7 +5363,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -10960,8 +11211,8 @@
+@@ -10965,8 +11214,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
@@ -5462,7 +5374,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11087,8 +11338,7 @@
+@@ -11092,8 +11341,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5472,7 +5384,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11191,8 +11441,7 @@
+@@ -11196,8 +11444,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5482,7 +5394,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11257,8 +11506,7 @@
+@@ -11262,8 +11509,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5492,7 +5404,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11351,8 +11599,7 @@
+@@ -11356,8 +11602,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5502,7 +5414,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11417,8 +11664,7 @@
+@@ -11422,8 +11667,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5512,7 +5424,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11484,8 +11730,7 @@
+@@ -11489,8 +11733,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5522,7 +5434,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11551,8 +11796,7 @@
+@@ -11556,8 +11799,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5532,16 +5444,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11627,7 +11871,7 @@
+@@ -11632,7 +11874,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11630 "configure"
-+#line 11874 "configure"
+-#line 11635 "configure"
++#line 11877 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11693,7 +11937,7 @@
+@@ -11698,7 +11940,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5550,16 +5462,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11725,7 +11969,7 @@
+@@ -11730,7 +11972,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11728 "configure"
-+#line 11972 "configure"
+-#line 11733 "configure"
++#line 11975 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11791,7 +12035,7 @@
+@@ -11796,7 +12038,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -5568,7 +5480,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11841,7 +12085,7 @@
+@@ -11846,7 +12088,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -5577,7 +5489,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -11850,47 +12094,10 @@
+@@ -11855,47 +12097,10 @@
    fi
    ;;
  
@@ -5626,7 +5538,7 @@
      ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11916,7 +12123,8 @@
+@@ -11921,7 +12126,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.
@@ -5636,7 +5548,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 \
-@@ -12030,11 +12238,11 @@
+@@ -12035,11 +12241,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -5650,7 +5562,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12064,6 +12272,12 @@
+@@ -12069,6 +12275,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -5663,7 +5575,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12094,7 +12308,7 @@
+@@ -12099,7 +12311,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -5672,7 +5584,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12125,7 +12339,7 @@
+@@ -12130,7 +12342,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -5681,7 +5593,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12140,7 +12354,7 @@
+@@ -12145,7 +12357,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -5690,7 +5602,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12367,7 +12581,10 @@
+@@ -12372,7 +12584,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.
@@ -5702,7 +5614,7 @@
  fi
  
  
-@@ -12432,7 +12649,9 @@
+@@ -12437,7 +12652,9 @@
  
        case $tagname in
        CXX)
@@ -5713,7 +5625,7 @@
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12469,7 +12688,7 @@
+@@ -12474,7 +12691,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -5722,7 +5634,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12490,6 +12709,20 @@
+@@ -12495,6 +12712,20 @@
  compiler=$CC
  
  
@@ -5743,7 +5655,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12511,7 +12744,16 @@
+@@ -12516,7 +12747,16 @@
  CC=${CXX-"c++"}
  compiler=$CC
  compiler_CXX=$CC
@@ -5761,7 +5673,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12582,7 +12824,7 @@
+@@ -12587,7 +12827,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,
@@ -5770,7 +5682,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'*)
-@@ -12616,7 +12858,7 @@
+@@ -12621,7 +12861,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -5779,7 +5691,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12635,8 +12877,8 @@
+@@ -12640,8 +12880,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
@@ -5790,7 +5702,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12662,7 +12904,7 @@
+@@ -12667,7 +12907,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.
@@ -5799,7 +5711,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12693,8 +12935,22 @@
+@@ -12698,8 +12938,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -5824,7 +5736,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12711,7 +12967,7 @@
+@@ -12716,7 +12970,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -5833,7 +5745,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`
-@@ -12732,6 +12988,9 @@
+@@ -12737,6 +12991,9 @@
  	fi
        esac
        shared_flag='-shared'
@@ -5843,7 +5755,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12740,15 +12999,16 @@
+@@ -12745,15 +13002,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -5864,7 +5776,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -12778,8 +13038,7 @@
+@@ -12783,8 +13041,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5874,7 +5786,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12808,13 +13067,12 @@
+@@ -12813,13 +13070,12 @@
  
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -5890,7 +5802,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12841,8 +13099,7 @@
+@@ -12846,8 +13102,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -5900,7 +5812,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12879,8 +13136,8 @@
+@@ -12884,8 +13139,8 @@
  	# Exported symbols can be pulled into shared objects from archives
  	whole_archive_flag_spec_CXX=' '
  	archive_cmds_need_lc_CXX=yes
@@ -5911,7 +5823,7 @@
        fi
      fi
      ;;
-@@ -12893,16 +13150,17 @@
+@@ -12898,16 +13153,17 @@
      esac
      ;;
  
@@ -5931,7 +5843,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
-@@ -12911,70 +13169,81 @@
+@@ -12916,70 +13172,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -6065,7 +5977,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -12985,14 +13254,14 @@
+@@ -12990,14 +13257,14 @@
  	;;
      esac
      ;;
@@ -6082,7 +5994,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13009,12 +13278,12 @@
+@@ -13014,12 +13281,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -6098,7 +6010,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13023,11 +13292,11 @@
+@@ -13028,11 +13295,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.
@@ -6112,7 +6024,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13037,7 +13306,7 @@
+@@ -13042,7 +13309,7 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -6121,7 +6033,7 @@
        hppa*64*)
  	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
  	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -13053,7 +13322,7 @@
+@@ -13058,7 +13325,7 @@
          ;;
        esac
      fi
@@ -6130,7 +6042,7 @@
      hppa*64*)
        hardcode_direct_CXX=no
        hardcode_shlibpath_var_CXX=no
-@@ -13074,17 +13343,17 @@
+@@ -13079,17 +13346,17 @@
      esac
  
      case $cc_basename in
@@ -6152,7 +6064,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13100,12 +13369,12 @@
+@@ -13105,12 +13372,12 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -6167,7 +6079,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13118,9 +13387,9 @@
+@@ -13123,9 +13390,9 @@
      ;;
    irix5* | irix6*)
      case $cc_basename in
@@ -6179,7 +6091,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13131,9 +13400,9 @@
+@@ -13136,9 +13403,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -6191,7 +6103,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13144,14 +13413,14 @@
+@@ -13149,14 +13416,14 @@
      ;;
    linux*)
      case $cc_basename in
@@ -6209,7 +6121,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13169,20 +13438,44 @@
+@@ -13174,20 +13441,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -6260,7 +6172,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13210,7 +13503,7 @@
+@@ -13215,7 +13506,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -6269,7 +6181,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13220,7 +13513,7 @@
+@@ -13225,7 +13516,7 @@
  	;;
      esac
      ;;
@@ -6278,7 +6190,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=
-@@ -13231,15 +13524,31 @@
+@@ -13236,15 +13527,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::"'
      ;;
@@ -6312,7 +6224,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13249,14 +13558,14 @@
+@@ -13254,14 +13561,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -6330,7 +6242,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13274,7 +13583,7 @@
+@@ -13279,7 +13586,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6339,7 +6251,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13293,13 +13602,13 @@
+@@ -13298,13 +13605,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -6355,7 +6267,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13308,17 +13617,17 @@
+@@ -13313,17 +13620,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -6377,7 +6289,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13337,7 +13646,7 @@
+@@ -13342,7 +13649,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -6386,7 +6298,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13361,7 +13670,7 @@
+@@ -13366,7 +13673,7 @@
    sco*)
      archive_cmds_need_lc_CXX=no
      case $cc_basename in
@@ -6395,7 +6307,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13373,12 +13682,12 @@
+@@ -13378,12 +13685,12 @@
      ;;
    sunos4*)
      case $cc_basename in
@@ -6410,7 +6322,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13391,36 +13700,33 @@
+@@ -13396,36 +13703,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -6459,7 +6371,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13428,9 +13734,9 @@
+@@ -13433,9 +13737,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -6471,7 +6383,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13440,9 +13746,9 @@
+@@ -13445,9 +13749,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
@@ -6483,7 +6395,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13451,9 +13757,9 @@
+@@ -13456,9 +13760,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -6495,7 +6407,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13471,7 +13777,7 @@
+@@ -13476,7 +13780,7 @@
      ;;
    tandem*)
      case $cc_basename in
@@ -6504,7 +6416,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13528,7 +13834,7 @@
+@@ -13533,7 +13837,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.
@@ -6513,7 +6425,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13568,7 +13874,7 @@
+@@ -13573,7 +13877,7 @@
         fi
         ;;
  
@@ -6522,7 +6434,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13604,6 +13910,20 @@
+@@ -13609,6 +13913,20 @@
  
  $rm -f confest.$objext
  
@@ -6543,7 +6455,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13659,7 +13979,7 @@
+@@ -13664,7 +13982,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -6552,7 +6464,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13684,18 +14004,28 @@
+@@ -13689,18 +14007,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -6584,7 +6496,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13703,22 +14033,22 @@
+@@ -13708,22 +14036,22 @@
  	    ;;
  	esac
  	;;
@@ -6611,7 +6523,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13733,7 +14063,7 @@
+@@ -13738,7 +14066,7 @@
  	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
@@ -6620,7 +6532,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13744,18 +14074,24 @@
+@@ -13749,18 +14077,24 @@
  	;;
        linux*)
  	case $cc_basename in
@@ -6648,7 +6560,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13772,25 +14108,25 @@
+@@ -13777,25 +14111,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -6679,7 +6591,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13806,7 +14142,7 @@
+@@ -13811,7 +14145,7 @@
  	;;
        sco*)
  	case $cc_basename in
@@ -6688,7 +6600,7 @@
  	    lt_prog_compiler_pic_CXX='-fPIC'
  	    ;;
  	  *)
-@@ -13815,13 +14151,13 @@
+@@ -13820,13 +14154,13 @@
  	;;
        solaris*)
  	case $cc_basename in
@@ -6704,7 +6616,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13831,12 +14167,12 @@
+@@ -13836,12 +14170,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -6719,7 +6631,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13846,7 +14182,7 @@
+@@ -13851,7 +14185,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -6728,7 +6640,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -13887,18 +14223,20 @@
+@@ -13892,18 +14226,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -6736,13 +6648,13 @@
 +   -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:13893: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14229: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13898: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14232: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:13897: \$? = $ac_status" >&5
-+   echo "$as_me:14233: \$? = $ac_status" >&5
+-   echo "$as_me:13902: \$? = $ac_status" >&5
++   echo "$as_me:14236: \$? = $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
@@ -6754,7 +6666,7 @@
         lt_prog_compiler_pic_works_CXX=yes
       fi
     fi
-@@ -13919,7 +14257,7 @@
+@@ -13924,7 +14260,7 @@
  fi
  
  fi
@@ -6763,7 +6675,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -13941,38 +14279,36 @@
+@@ -13946,38 +14282,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -6784,13 +6696,13 @@
 +   -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:13960: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14291: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13965: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14294: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:13964: \$? = $ac_status" >&5
-+   echo "$as_me:14295: \$? = $ac_status" >&5
+-   echo "$as_me:13969: \$? = $ac_status" >&5
++   echo "$as_me:14298: \$? = $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
@@ -6814,7 +6726,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -14022,7 +14358,10 @@
+@@ -14027,7 +14361,10 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -6826,7 +6738,7 @@
    ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14105,7 +14444,7 @@
+@@ -14110,7 +14447,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -6835,7 +6747,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14115,7 +14454,20 @@
+@@ -14120,7 +14457,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6857,7 +6769,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14180,7 +14532,7 @@
+@@ -14185,7 +14535,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6866,7 +6778,7 @@
    ;;
  
  beos*)
-@@ -14189,7 +14541,7 @@
+@@ -14194,7 +14544,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -6875,7 +6787,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14205,7 +14557,7 @@
+@@ -14210,7 +14560,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -6884,7 +6796,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14217,7 +14569,8 @@
+@@ -14222,7 +14572,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -6894,7 +6806,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14247,7 +14600,7 @@
+@@ -14252,7 +14603,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -6903,7 +6815,7 @@
        ;;
      esac
      ;;
-@@ -14270,7 +14623,7 @@
+@@ -14275,7 +14626,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -6912,7 +6824,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"`
-@@ -14293,7 +14646,7 @@
+@@ -14298,7 +14649,7 @@
    dynamic_linker=no
    ;;
  
@@ -6921,7 +6833,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14305,8 +14658,17 @@
+@@ -14310,8 +14661,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -6941,7 +6853,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14324,7 +14686,7 @@
+@@ -14329,7 +14689,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -6950,7 +6862,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -14351,9 +14713,9 @@
+@@ -14356,9 +14716,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -6962,7 +6874,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14368,7 +14730,7 @@
+@@ -14373,7 +14733,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -6971,7 +6883,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14379,7 +14741,7 @@
+@@ -14384,7 +14744,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -6980,7 +6892,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14441,22 +14803,19 @@
+@@ -14446,22 +14806,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -7009,7 +6921,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,
-@@ -14466,6 +14825,30 @@
+@@ -14471,6 +14828,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -7040,7 +6952,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14475,7 +14858,7 @@
+@@ -14480,7 +14861,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -7049,7 +6961,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14504,7 +14887,11 @@
+@@ -14509,7 +14890,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -7062,7 +6974,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
-@@ -14524,7 +14911,7 @@
+@@ -14529,7 +14914,7 @@
  
  os2*)
    libname_spec='$name'
@@ -7071,7 +6983,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14626,8 +15013,8 @@
+@@ -14631,8 +15016,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -7082,7 +6994,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14753,8 +15140,7 @@
+@@ -14758,8 +15143,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7092,7 +7004,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14857,8 +15243,7 @@
+@@ -14862,8 +15246,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7102,7 +7014,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14923,8 +15308,7 @@
+@@ -14928,8 +15311,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7112,7 +7024,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15017,8 +15401,7 @@
+@@ -15022,8 +15404,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7122,7 +7034,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15083,8 +15466,7 @@
+@@ -15088,8 +15469,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7132,7 +7044,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15150,8 +15532,7 @@
+@@ -15155,8 +15535,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7142,7 +7054,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15217,8 +15598,7 @@
+@@ -15222,8 +15601,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7152,16 +7064,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -15293,7 +15673,7 @@
+@@ -15298,7 +15676,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 15296 "configure"
-+#line 15676 "configure"
+-#line 15301 "configure"
++#line 15679 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15359,7 +15739,7 @@
+@@ -15364,7 +15742,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7170,16 +7082,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15391,7 +15771,7 @@
+@@ -15396,7 +15774,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 15394 "configure"
-+#line 15774 "configure"
+-#line 15399 "configure"
++#line 15777 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15457,7 +15837,7 @@
+@@ -15462,7 +15840,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -7188,7 +7100,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15508,7 +15888,8 @@
+@@ -15513,7 +15891,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.
@@ -7198,7 +7110,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 \
-@@ -15608,6 +15989,12 @@
+@@ -15613,6 +15992,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -7211,7 +7123,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -15638,7 +16025,7 @@
+@@ -15643,7 +16028,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -7220,7 +7132,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -15669,7 +16056,7 @@
+@@ -15674,7 +16059,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -7229,7 +7141,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -15684,7 +16071,7 @@
+@@ -15689,7 +16074,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
@@ -7238,7 +7150,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -15886,7 +16273,10 @@
+@@ -15891,7 +16276,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.
@@ -7250,7 +7162,7 @@
  fi
  
  
-@@ -15962,12 +16352,35 @@
+@@ -15967,12 +16355,35 @@
  compiler=$CC
  
  
@@ -7287,7 +7199,7 @@
  
  echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
  echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15980,7 +16393,7 @@
+@@ -15985,7 +16396,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -7296,7 +7208,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -15988,8 +16401,10 @@
+@@ -15993,8 +16404,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -7309,7 +7221,7 @@
    ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -16066,7 +16481,7 @@
+@@ -16071,7 +16484,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -7318,7 +7230,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16092,6 +16507,16 @@
+@@ -16097,6 +16510,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -7335,7 +7247,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16103,7 +16528,7 @@
+@@ -16108,7 +16531,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.
@@ -7344,7 +7256,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16127,12 +16552,19 @@
+@@ -16132,12 +16555,19 @@
        ;;
  
      linux*)
@@ -7365,7 +7277,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16153,9 +16585,14 @@
+@@ -16158,9 +16588,14 @@
        ;;
  
      solaris*)
@@ -7381,7 +7293,7 @@
        ;;
  
      sunos4*)
-@@ -16177,6 +16614,11 @@
+@@ -16182,6 +16617,11 @@
        fi
        ;;
  
@@ -7393,7 +7305,7 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16211,18 +16653,20 @@
+@@ -16216,18 +16656,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -7401,13 +7313,13 @@
 +   -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:16217: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16659: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16222: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16662: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16221: \$? = $ac_status" >&5
-+   echo "$as_me:16663: \$? = $ac_status" >&5
+-   echo "$as_me:16226: \$? = $ac_status" >&5
++   echo "$as_me:16666: \$? = $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
@@ -7419,7 +7331,7 @@
         lt_prog_compiler_pic_works_F77=yes
       fi
     fi
-@@ -16243,7 +16687,7 @@
+@@ -16248,7 +16690,7 @@
  fi
  
  fi
@@ -7428,7 +7340,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16265,38 +16709,36 @@
+@@ -16270,38 +16712,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -7449,13 +7361,13 @@
 +   -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:16284: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16721: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16289: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16724: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16288: \$? = $ac_status" >&5
-+   echo "$as_me:16725: \$? = $ac_status" >&5
+-   echo "$as_me:16293: \$? = $ac_status" >&5
++   echo "$as_me:16728: \$? = $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
@@ -7479,7 +7391,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16367,6 +16809,16 @@
+@@ -16372,6 +16812,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -7496,7 +7408,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16387,6 +16839,27 @@
+@@ -16392,6 +16842,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -7524,7 +7436,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16424,7 +16897,7 @@
+@@ -16429,7 +16900,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -7533,7 +7445,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16434,13 +16907,13 @@
+@@ -16439,13 +16910,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'
@@ -7550,7 +7462,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
-@@ -16449,19 +16922,51 @@
+@@ -16454,19 +16925,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -7607,7 +7519,7 @@
        fi
        ;;
  
-@@ -16479,8 +16984,8 @@
+@@ -16484,8 +16987,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7618,7 +7530,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16495,24 +17000,19 @@
+@@ -16500,24 +17003,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7650,7 +7562,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16546,9 +17046,20 @@
+@@ -16551,9 +17049,20 @@
  	else
  	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -7673,7 +7585,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16565,7 +17076,7 @@
+@@ -16570,7 +17079,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -7682,7 +7594,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`
-@@ -16586,6 +17097,9 @@
+@@ -16591,6 +17100,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -7692,7 +7604,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16594,21 +17108,22 @@
+@@ -16599,21 +17111,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -7720,7 +7632,7 @@
        program main
  
        end
-@@ -16622,8 +17137,7 @@
+@@ -16627,8 +17140,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7730,7 +7642,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16650,14 +17164,13 @@
+@@ -16655,14 +17167,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -7748,7 +7660,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16674,8 +17187,7 @@
+@@ -16679,8 +17190,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7758,7 +7670,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -16712,8 +17224,8 @@
+@@ -16717,8 +17227,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_F77=' '
  	  archive_cmds_need_lc_F77=yes
@@ -7769,7 +7681,7 @@
  	fi
        fi
        ;;
-@@ -16726,7 +17238,7 @@
+@@ -16731,7 +17241,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -7778,7 +7690,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16736,68 +17248,68 @@
+@@ -16741,68 +17251,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -7891,7 +7803,7 @@
      fi
        ;;
  
-@@ -16831,8 +17343,8 @@
+@@ -16836,8 +17346,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7902,7 +7814,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -16840,7 +17352,7 @@
+@@ -16845,7 +17355,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -7911,7 +7823,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
-@@ -16856,16 +17368,16 @@
+@@ -16861,16 +17371,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -7932,7 +7844,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -16875,7 +17387,7 @@
+@@ -16880,7 +17390,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -7941,7 +7853,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16908,7 +17420,7 @@
+@@ -16913,7 +17423,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -7950,7 +7862,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'
-@@ -16918,7 +17430,7 @@
+@@ -16923,7 +17433,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -7959,7 +7871,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
-@@ -16941,7 +17453,8 @@
+@@ -16946,7 +17456,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
@@ -7969,7 +7881,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -16951,7 +17464,7 @@
+@@ -16956,7 +17467,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -7978,7 +7890,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -16962,14 +17475,14 @@
+@@ -16967,14 +17478,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -7995,7 +7907,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'
-@@ -16981,13 +17494,13 @@
+@@ -16986,13 +17497,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8011,7 +7923,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17006,10 +17519,12 @@
+@@ -17011,10 +17522,12 @@
      solaris*)
        no_undefined_flag_F77=' -z text'
        if test "$GCC" = yes; then
@@ -8026,7 +7938,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'
-@@ -17018,8 +17533,18 @@
+@@ -17023,8 +17536,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -8047,7 +7959,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17028,7 +17553,7 @@
+@@ -17033,7 +17556,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.
@@ -8056,7 +7968,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17088,9 +17613,9 @@
+@@ -17093,9 +17616,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_F77='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -8068,7 +7980,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_F77=no
-@@ -17196,7 +17721,7 @@
+@@ -17201,7 +17724,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -8077,7 +7989,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17206,7 +17731,20 @@
+@@ -17211,7 +17734,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8099,7 +8011,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17271,7 +17809,7 @@
+@@ -17276,7 +17812,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8108,7 +8020,7 @@
    ;;
  
  beos*)
-@@ -17280,7 +17818,7 @@
+@@ -17285,7 +17821,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -8117,7 +8029,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17296,7 +17834,7 @@
+@@ -17301,7 +17837,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -8126,7 +8038,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17308,7 +17846,8 @@
+@@ -17313,7 +17849,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -8136,7 +8048,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17338,7 +17877,7 @@
+@@ -17343,7 +17880,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -8145,7 +8057,7 @@
        ;;
      esac
      ;;
-@@ -17361,7 +17900,7 @@
+@@ -17366,7 +17903,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -8154,7 +8066,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"`
-@@ -17384,7 +17923,7 @@
+@@ -17389,7 +17926,7 @@
    dynamic_linker=no
    ;;
  
@@ -8163,7 +8075,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17396,8 +17935,17 @@
+@@ -17401,8 +17938,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -8183,7 +8095,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17415,7 +17963,7 @@
+@@ -17420,7 +17966,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -8192,7 +8104,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -17442,9 +17990,9 @@
+@@ -17447,9 +17993,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -8204,7 +8116,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17459,7 +18007,7 @@
+@@ -17464,7 +18010,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -8213,7 +8125,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17470,7 +18018,7 @@
+@@ -17475,7 +18021,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -8222,7 +8134,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17532,22 +18080,19 @@
+@@ -17537,22 +18083,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -8251,7 +8163,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,
-@@ -17557,6 +18102,30 @@
+@@ -17562,6 +18105,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -8282,7 +8194,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17566,7 +18135,7 @@
+@@ -17571,7 +18138,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -8291,7 +8203,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17595,7 +18164,11 @@
+@@ -17600,7 +18167,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -8304,7 +8216,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
-@@ -17615,7 +18188,7 @@
+@@ -17620,7 +18191,7 @@
  
  os2*)
    libname_spec='$name'
@@ -8313,7 +8225,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17717,8 +18290,8 @@
+@@ -17722,8 +18293,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -8324,7 +8236,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17794,7 +18367,8 @@
+@@ -17799,7 +18370,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.
@@ -8334,7 +8246,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 \
-@@ -17894,6 +18468,12 @@
+@@ -17899,6 +18471,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -8347,7 +8259,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -17924,7 +18504,7 @@
+@@ -17929,7 +18507,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -8356,7 +8268,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -17955,7 +18535,7 @@
+@@ -17960,7 +18538,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -8365,7 +8277,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -17970,7 +18550,7 @@
+@@ -17975,7 +18553,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -8374,7 +8286,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18172,7 +18752,10 @@
+@@ -18177,7 +18755,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.
@@ -8386,7 +8298,7 @@
  fi
  
  
-@@ -18205,7 +18788,7 @@
+@@ -18210,7 +18791,7 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -8395,7 +8307,7 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -18216,15 +18799,41 @@
+@@ -18221,15 +18802,41 @@
  compiler=$CC
  
  
@@ -8437,7 +8349,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
-@@ -18251,18 +18860,20 @@
+@@ -18256,18 +18863,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -8445,13 +8357,13 @@
 +   -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:18257: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18866: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18262: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18869: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18261: \$? = $ac_status" >&5
-+   echo "$as_me:18870: \$? = $ac_status" >&5
+-   echo "$as_me:18266: \$? = $ac_status" >&5
++   echo "$as_me:18873: \$? = $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
@@ -8463,7 +8375,7 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -18339,7 +18950,7 @@
+@@ -18344,7 +18953,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -8472,7 +8384,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18365,6 +18976,16 @@
+@@ -18370,6 +18979,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -8489,7 +8401,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18376,7 +18997,7 @@
+@@ -18381,7 +19000,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.
@@ -8498,7 +8410,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18400,12 +19021,19 @@
+@@ -18405,12 +19024,19 @@
        ;;
  
      linux*)
@@ -8519,7 +8431,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18426,9 +19054,14 @@
+@@ -18431,9 +19057,14 @@
        ;;
  
      solaris*)
@@ -8535,7 +8447,7 @@
        ;;
  
      sunos4*)
-@@ -18450,6 +19083,11 @@
+@@ -18455,6 +19086,11 @@
        fi
        ;;
  
@@ -8547,7 +8459,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18484,18 +19122,20 @@
+@@ -18489,18 +19125,20 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -8555,13 +8467,13 @@
 +   -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:18490: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19128: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18495: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19131: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18494: \$? = $ac_status" >&5
-+   echo "$as_me:19132: \$? = $ac_status" >&5
+-   echo "$as_me:18499: \$? = $ac_status" >&5
++   echo "$as_me:19135: \$? = $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
@@ -8573,7 +8485,7 @@
         lt_prog_compiler_pic_works_GCJ=yes
       fi
     fi
-@@ -18516,7 +19156,7 @@
+@@ -18521,7 +19159,7 @@
  fi
  
  fi
@@ -8582,7 +8494,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18538,38 +19178,36 @@
+@@ -18543,38 +19181,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -8603,13 +8515,13 @@
 +   -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:18557: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19190: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18562: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19193: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18561: \$? = $ac_status" >&5
-+   echo "$as_me:19194: \$? = $ac_status" >&5
+-   echo "$as_me:18566: \$? = $ac_status" >&5
++   echo "$as_me:19197: \$? = $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
@@ -8633,7 +8545,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18640,6 +19278,16 @@
+@@ -18645,6 +19281,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -8650,7 +8562,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18660,6 +19308,27 @@
+@@ -18665,6 +19311,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -8678,7 +8590,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18697,7 +19366,7 @@
+@@ -18702,7 +19369,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -8687,7 +8599,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18707,13 +19376,13 @@
+@@ -18712,13 +19379,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'
@@ -8704,7 +8616,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
-@@ -18722,19 +19391,51 @@
+@@ -18727,19 +19394,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -8761,7 +8673,7 @@
        fi
        ;;
  
-@@ -18752,8 +19453,8 @@
+@@ -18757,8 +19456,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8772,7 +8684,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18768,24 +19469,19 @@
+@@ -18773,24 +19472,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8804,7 +8716,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18819,9 +19515,20 @@
+@@ -18824,9 +19518,20 @@
  	else
  	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -8827,7 +8739,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18838,7 +19545,7 @@
+@@ -18843,7 +19548,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -8836,7 +8748,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`
-@@ -18859,6 +19566,9 @@
+@@ -18864,6 +19569,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -8846,7 +8758,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -18867,21 +19577,22 @@
+@@ -18872,21 +19580,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -8874,7 +8786,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -18905,8 +19616,7 @@
+@@ -18910,8 +19619,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8884,7 +8796,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -18933,14 +19643,13 @@
+@@ -18938,14 +19646,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -8902,7 +8814,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -18967,8 +19676,7 @@
+@@ -18972,8 +19679,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -8912,7 +8824,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -19005,8 +19713,8 @@
+@@ -19010,8 +19716,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_GCJ=' '
  	  archive_cmds_need_lc_GCJ=yes
@@ -8923,7 +8835,7 @@
  	fi
        fi
        ;;
-@@ -19019,7 +19727,7 @@
+@@ -19024,7 +19730,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -8932,7 +8844,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19029,68 +19737,68 @@
+@@ -19034,68 +19740,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -9045,7 +8957,7 @@
      fi
        ;;
  
-@@ -19124,8 +19832,8 @@
+@@ -19129,8 +19835,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -9056,7 +8968,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19133,7 +19841,7 @@
+@@ -19138,7 +19844,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -9065,7 +8977,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
-@@ -19149,16 +19857,16 @@
+@@ -19154,16 +19860,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -9086,7 +8998,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -19168,7 +19876,7 @@
+@@ -19173,7 +19879,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -9095,7 +9007,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19201,7 +19909,7 @@
+@@ -19206,7 +19912,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -9104,7 +9016,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'
-@@ -19211,7 +19919,7 @@
+@@ -19216,7 +19922,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -9113,7 +9025,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
-@@ -19234,7 +19942,8 @@
+@@ -19239,7 +19945,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
@@ -9123,7 +9035,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19244,7 +19953,7 @@
+@@ -19249,7 +19956,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -9132,7 +9044,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19255,14 +19964,14 @@
+@@ -19260,14 +19967,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -9149,7 +9061,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'
-@@ -19274,13 +19983,13 @@
+@@ -19279,13 +19986,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -9165,7 +9077,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19299,10 +20008,12 @@
+@@ -19304,10 +20011,12 @@
      solaris*)
        no_undefined_flag_GCJ=' -z text'
        if test "$GCC" = yes; then
@@ -9180,7 +9092,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'
-@@ -19311,8 +20022,18 @@
+@@ -19316,8 +20025,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -9201,7 +9113,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19321,7 +20042,7 @@
+@@ -19326,7 +20045,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.
@@ -9210,7 +9122,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19381,9 +20102,9 @@
+@@ -19386,9 +20105,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_GCJ='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -9222,7 +9134,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_GCJ=no
-@@ -19489,7 +20210,7 @@
+@@ -19494,7 +20213,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -9231,7 +9143,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19499,7 +20220,20 @@
+@@ -19504,7 +20223,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9253,7 +9165,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19564,7 +20298,7 @@
+@@ -19569,7 +20301,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -9262,7 +9174,7 @@
    ;;
  
  beos*)
-@@ -19573,7 +20307,7 @@
+@@ -19578,7 +20310,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -9271,7 +9183,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19589,7 +20323,7 @@
+@@ -19594,7 +20326,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -9280,7 +9192,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19601,7 +20335,8 @@
+@@ -19606,7 +20338,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -9290,7 +9202,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19631,7 +20366,7 @@
+@@ -19636,7 +20369,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -9299,7 +9211,7 @@
        ;;
      esac
      ;;
-@@ -19654,7 +20389,7 @@
+@@ -19659,7 +20392,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -9308,7 +9220,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"`
-@@ -19677,7 +20412,7 @@
+@@ -19682,7 +20415,7 @@
    dynamic_linker=no
    ;;
  
@@ -9317,7 +9229,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19689,8 +20424,17 @@
+@@ -19694,8 +20427,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -9337,7 +9249,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19708,7 +20452,7 @@
+@@ -19713,7 +20455,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -9346,7 +9258,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -19735,9 +20479,9 @@
+@@ -19740,9 +20482,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -9358,7 +9270,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19752,7 +20496,7 @@
+@@ -19757,7 +20499,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -9367,7 +9279,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19763,7 +20507,7 @@
+@@ -19768,7 +20510,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -9376,7 +9288,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19825,22 +20569,19 @@
+@@ -19830,22 +20572,19 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -9405,7 +9317,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,
-@@ -19850,6 +20591,30 @@
+@@ -19855,6 +20594,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -9436,7 +9348,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -19859,7 +20624,7 @@
+@@ -19864,7 +20627,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -9445,7 +9357,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -19888,7 +20653,11 @@
+@@ -19893,7 +20656,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -9458,7 +9370,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
-@@ -19908,7 +20677,7 @@
+@@ -19913,7 +20680,7 @@
  
  os2*)
    libname_spec='$name'
@@ -9467,7 +9379,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -20010,8 +20779,8 @@
+@@ -20015,8 +20782,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_GCJ=
  if test -n "$hardcode_libdir_flag_spec_GCJ" || \
@@ -9478,7 +9390,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_GCJ" != no &&
-@@ -20137,8 +20906,7 @@
+@@ -20142,8 +20909,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9488,7 +9400,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20241,8 +21009,7 @@
+@@ -20246,8 +21012,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9498,7 +9410,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20307,8 +21074,7 @@
+@@ -20312,8 +21077,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9508,7 +9420,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20401,8 +21167,7 @@
+@@ -20406,8 +21170,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9518,7 +9430,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20467,8 +21232,7 @@
+@@ -20472,8 +21235,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9528,7 +9440,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20534,8 +21298,7 @@
+@@ -20539,8 +21301,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9538,7 +9450,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20601,8 +21364,7 @@
+@@ -20606,8 +21367,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9548,16 +9460,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -20677,7 +21439,7 @@
+@@ -20682,7 +21442,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 20680 "configure"
-+#line 21442 "configure"
+-#line 20685 "configure"
++#line 21445 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20743,7 +21505,7 @@
+@@ -20748,7 +21508,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9566,16 +9478,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20775,7 +21537,7 @@
+@@ -20780,7 +21540,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 20778 "configure"
-+#line 21540 "configure"
+-#line 20783 "configure"
++#line 21543 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20841,7 +21603,7 @@
+@@ -20846,7 +21606,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -9584,7 +9496,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20892,7 +21654,8 @@
+@@ -20897,7 +21657,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.
@@ -9594,7 +9506,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 \
-@@ -20992,6 +21755,12 @@
+@@ -20997,6 +21758,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -9607,7 +9519,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21022,7 +21791,7 @@
+@@ -21027,7 +21794,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -9616,7 +9528,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21053,7 +21822,7 @@
+@@ -21058,7 +21825,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -9625,7 +9537,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21068,7 +21837,7 @@
+@@ -21073,7 +21840,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -9634,7 +9546,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21270,7 +22039,10 @@
+@@ -21275,7 +22042,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.
@@ -9646,7 +9558,7 @@
  fi
  
  
-@@ -21313,11 +22085,35 @@
+@@ -21318,11 +22088,35 @@
  compiler=$CC
  
  
@@ -9682,7 +9594,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21333,7 +22129,8 @@
+@@ -21338,7 +22132,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.
@@ -9692,7 +9604,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 \
-@@ -21433,6 +22230,12 @@
+@@ -21438,6 +22233,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -9705,7 +9617,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21463,7 +22266,7 @@
+@@ -21468,7 +22269,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -9714,7 +9626,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21494,7 +22297,7 @@
+@@ -21499,7 +22300,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -9723,7 +9635,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21509,7 +22312,7 @@
+@@ -21514,7 +22315,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -9732,7 +9644,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21711,7 +22514,10 @@
+@@ -21716,7 +22517,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.
@@ -9744,7 +9656,7 @@
  fi
  
  
-@@ -21758,7 +22564,7 @@
+@@ -21763,7 +22567,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -9753,7 +9665,7 @@
  
  # Prevent multiple expansion
  
-@@ -21999,8 +22805,7 @@
+@@ -22004,8 +22808,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9763,7 +9675,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22074,9 +22879,6 @@
+@@ -22079,9 +22882,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9773,7 +9685,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22110,8 +22912,7 @@
+@@ -22115,8 +22915,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9783,7 +9695,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22215,8 +23016,7 @@
+@@ -22220,8 +23019,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9793,7 +9705,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22295,9 +23095,6 @@
+@@ -22300,9 +23098,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9803,7 +9715,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22330,8 +23127,7 @@
+@@ -22335,8 +23130,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9813,7 +9725,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22434,8 +23230,7 @@
+@@ -22439,8 +23233,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9823,7 +9735,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22525,8 +23320,7 @@
+@@ -22530,8 +23323,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9833,7 +9745,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22587,8 +23381,7 @@
+@@ -22592,8 +23384,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9843,7 +9755,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22656,8 +23449,7 @@
+@@ -22661,8 +23452,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9853,7 +9765,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22723,8 +23515,7 @@
+@@ -22728,8 +23518,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9863,7 +9775,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22817,8 +23608,7 @@
+@@ -22822,8 +23611,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9873,7 +9785,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22896,8 +23686,7 @@
+@@ -22901,8 +23689,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9883,7 +9795,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -22981,8 +23770,7 @@
+@@ -22986,8 +23773,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9893,7 +9805,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23050,8 +23838,7 @@
+@@ -23055,8 +23841,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9903,7 +9815,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23146,8 +23933,7 @@
+@@ -23151,8 +23936,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9913,7 +9825,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23211,8 +23997,7 @@
+@@ -23216,8 +24000,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9923,7 +9835,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23307,8 +24092,7 @@
+@@ -23312,8 +24095,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9933,7 +9845,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23372,8 +24156,7 @@
+@@ -23377,8 +24159,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9943,7 +9855,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23469,8 +24252,7 @@
+@@ -23474,8 +24255,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9953,7 +9865,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23534,8 +24316,7 @@
+@@ -23539,8 +24319,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9963,7 +9875,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23632,8 +24413,7 @@
+@@ -23637,8 +24416,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9973,7 +9885,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23698,8 +24478,7 @@
+@@ -23703,8 +24481,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9983,7 +9895,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23767,8 +24546,7 @@
+@@ -23772,8 +24549,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -9993,7 +9905,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -23919,8 +24697,7 @@
+@@ -23924,8 +24700,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10003,7 +9915,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24075,8 +24852,7 @@
+@@ -24080,8 +24855,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10013,7 +9925,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24141,8 +24917,7 @@
+@@ -24146,8 +24920,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10023,7 +9935,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24289,8 +25064,7 @@
+@@ -24294,8 +25067,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10033,7 +9945,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24445,8 +25219,7 @@
+@@ -24450,8 +25222,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10043,7 +9955,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24502,9 +25275,6 @@
+@@ -24507,9 +25278,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -10053,7 +9965,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24538,8 +25308,7 @@
+@@ -24543,8 +25311,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10063,7 +9975,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24643,8 +25412,7 @@
+@@ -24648,8 +25415,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10073,7 +9985,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24744,8 +25512,7 @@
+@@ -24749,8 +25515,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10083,7 +9995,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24819,8 +25586,7 @@
+@@ -24824,8 +25589,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10093,7 +10005,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24883,8 +25649,7 @@
+@@ -24888,8 +25652,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10103,7 +10015,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24946,8 +25711,7 @@
+@@ -24951,8 +25714,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10113,7 +10025,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -24987,8 +25751,7 @@
+@@ -24992,8 +25754,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10123,7 +10035,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25044,8 +25807,7 @@
+@@ -25049,8 +25810,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10133,7 +10045,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25085,8 +25847,7 @@
+@@ -25090,8 +25850,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10143,7 +10055,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25150,8 +25911,7 @@
+@@ -25155,8 +25914,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10153,7 +10065,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25182,10 +25942,8 @@
+@@ -25187,10 +25945,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10166,7 +10078,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25296,8 +26054,7 @@
+@@ -25301,8 +26057,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10176,7 +10088,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25359,8 +26116,7 @@
+@@ -25364,8 +26119,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10186,7 +10098,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25400,8 +26156,7 @@
+@@ -25405,8 +26159,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10196,7 +10108,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25457,8 +26212,7 @@
+@@ -25462,8 +26215,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10206,7 +10118,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25498,8 +26252,7 @@
+@@ -25503,8 +26255,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10216,7 +10128,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25563,8 +26316,7 @@
+@@ -25568,8 +26319,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10226,7 +10138,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25595,10 +26347,8 @@
+@@ -25600,10 +26350,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10239,7 +10151,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -25709,8 +26459,7 @@
+@@ -25714,8 +26462,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10249,7 +10161,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25772,8 +26521,7 @@
+@@ -25777,8 +26524,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10259,7 +10171,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25813,8 +26561,7 @@
+@@ -25818,8 +26564,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10269,7 +10181,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25870,8 +26617,7 @@
+@@ -25875,8 +26620,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10279,7 +10191,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25911,8 +26657,7 @@
+@@ -25916,8 +26660,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10289,7 +10201,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -25976,8 +26721,7 @@
+@@ -25981,8 +26724,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10299,7 +10211,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26008,10 +26752,8 @@
+@@ -26013,10 +26755,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10312,7 +10224,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26122,8 +26864,7 @@
+@@ -26127,8 +26867,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10322,7 +10234,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26185,8 +26926,7 @@
+@@ -26190,8 +26929,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10332,7 +10244,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26226,8 +26966,7 @@
+@@ -26231,8 +26969,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10342,7 +10254,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26283,8 +27022,7 @@
+@@ -26288,8 +27025,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10352,7 +10264,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26324,8 +27062,7 @@
+@@ -26329,8 +27065,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10362,7 +10274,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26389,8 +27126,7 @@
+@@ -26394,8 +27129,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10372,7 +10284,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26421,10 +27157,8 @@
+@@ -26426,10 +27160,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10385,7 +10297,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -26543,8 +27277,7 @@
+@@ -26548,8 +27280,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10395,7 +10307,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26615,8 +27348,7 @@
+@@ -26620,8 +27351,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10405,7 +10317,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26686,8 +27418,7 @@
+@@ -26691,8 +27421,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10415,7 +10327,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26749,8 +27480,7 @@
+@@ -26754,8 +27483,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10425,7 +10337,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26790,8 +27520,7 @@
+@@ -26795,8 +27523,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10435,7 +10347,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26847,8 +27576,7 @@
+@@ -26852,8 +27579,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10445,7 +10357,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26888,8 +27616,7 @@
+@@ -26893,8 +27619,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10455,7 +10367,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26953,8 +27680,7 @@
+@@ -26958,8 +27683,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10465,7 +10377,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -26985,10 +27711,8 @@
+@@ -26990,10 +27714,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10478,7 +10390,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27100,8 +27824,7 @@
+@@ -27105,8 +27827,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10488,7 +10400,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27163,8 +27886,7 @@
+@@ -27168,8 +27889,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10498,7 +10410,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27204,8 +27926,7 @@
+@@ -27209,8 +27929,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10508,7 +10420,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27261,8 +27982,7 @@
+@@ -27266,8 +27985,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10518,7 +10430,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27302,8 +28022,7 @@
+@@ -27307,8 +28025,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10528,7 +10440,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27367,8 +28086,7 @@
+@@ -27372,8 +28089,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10538,7 +10450,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27399,10 +28117,8 @@
+@@ -27404,10 +28120,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -10551,7 +10463,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -27513,8 +28229,7 @@
+@@ -27518,8 +28232,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10561,7 +10473,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27595,8 +28310,7 @@
+@@ -27600,8 +28313,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10571,7 +10483,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27696,8 +28410,7 @@
+@@ -27701,8 +28413,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10581,7 +10493,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27877,8 +28590,7 @@
+@@ -27882,8 +28593,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10591,7 +10503,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -27987,8 +28699,7 @@
+@@ -27992,8 +28702,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10601,7 +10513,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28212,8 +28923,7 @@
+@@ -28217,8 +28926,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10611,7 +10523,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28436,8 +29146,7 @@
+@@ -28441,8 +29149,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10621,7 +10533,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28513,8 +29222,7 @@
+@@ -28518,8 +29225,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10631,7 +10543,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28740,8 +29448,7 @@
+@@ -28745,8 +29451,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10641,7 +10553,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28816,8 +29523,7 @@
+@@ -28821,8 +29526,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10651,7 +10563,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28877,8 +29583,7 @@
+@@ -28882,8 +29586,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10661,7 +10573,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -28961,8 +29666,7 @@
+@@ -28966,8 +29669,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10671,7 +10583,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29055,8 +29759,7 @@
+@@ -29060,8 +29762,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10681,7 +10593,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29230,8 +29933,7 @@
+@@ -29235,8 +29936,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10691,7 +10603,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29329,8 +30031,7 @@
+@@ -29334,8 +30034,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10701,7 +10613,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29417,8 +30118,7 @@
+@@ -29422,8 +30121,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10711,7 +10623,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29495,8 +30195,7 @@
+@@ -29500,8 +30198,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10721,25 +10633,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -29549,7 +30248,7 @@
+@@ -29554,7 +30251,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29552: $i/$j" >&5
-+    echo "configure: 30251: $i/$j" >&5
+-    echo "configure: 29557: $i/$j" >&5
++    echo "configure: 30254: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29847,7 +30546,7 @@
+@@ -29852,7 +30549,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29850: $i/$j" >&5
-+    echo "configure: 30549: $i/$j" >&5
+-    echo "configure: 29855: $i/$j" >&5
++    echo "configure: 30552: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30524,8 +31223,7 @@
+@@ -30529,8 +31226,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10749,43 +10661,43 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -30684,7 +31382,7 @@
+@@ -30689,7 +31385,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30687: $i/$j" >&5
-+    echo "configure: 31385: $i/$j" >&5
+-    echo "configure: 30692: $i/$j" >&5
++    echo "configure: 31388: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30714,7 +31412,7 @@
+@@ -30719,7 +31415,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30717: $i/$j" >&5
-+    echo "configure: 31415: $i/$j" >&5
+-    echo "configure: 30722: $i/$j" >&5
++    echo "configure: 31418: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30732,7 +31430,7 @@
+@@ -30737,7 +31433,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30735: $i/$j" >&5
-+    echo "configure: 31433: $i/$j" >&5
+-    echo "configure: 30740: $i/$j" >&5
++    echo "configure: 31436: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -32255,7 +32953,7 @@
+@@ -32260,7 +32956,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
--    echo "configure: 32258: $i/$j" >&5
-+    echo "configure: 32956: $i/$j" >&5
+-    echo "configure: 32263: $i/$j" >&5
++    echo "configure: 32959: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32514,8 +33212,7 @@
+@@ -32519,8 +33215,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10795,7 +10707,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32610,8 +33307,7 @@
+@@ -32615,8 +33310,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10805,7 +10717,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32704,8 +33400,7 @@
+@@ -32709,8 +33403,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10815,7 +10727,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32827,8 +33522,7 @@
+@@ -32832,8 +33525,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10825,7 +10737,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -32885,8 +33579,7 @@
+@@ -32890,8 +33582,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10835,7 +10747,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33025,8 +33718,7 @@
+@@ -33030,8 +33721,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10845,7 +10757,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33266,8 +33958,7 @@
+@@ -33271,8 +33961,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10855,7 +10767,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33335,8 +34026,7 @@
+@@ -33340,8 +34029,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10865,7 +10777,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33431,8 +34121,7 @@
+@@ -33436,8 +34124,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10875,7 +10787,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33675,8 +34364,7 @@
+@@ -33680,8 +34367,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10885,7 +10797,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33748,8 +34436,7 @@
+@@ -33753,8 +34439,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10895,7 +10807,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33803,8 +34490,7 @@
+@@ -33808,8 +34493,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10905,7 +10817,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33875,8 +34561,7 @@
+@@ -33880,8 +34564,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10915,7 +10827,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33930,8 +34615,7 @@
+@@ -33935,8 +34618,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10925,7 +10837,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -33998,8 +34682,7 @@
+@@ -34003,8 +34685,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10935,7 +10847,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34205,8 +34888,7 @@
+@@ -34210,8 +34891,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10945,7 +10857,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34351,8 +35033,7 @@
+@@ -34356,8 +35036,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10955,7 +10867,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34525,8 +35206,7 @@
+@@ -34530,8 +35209,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10965,7 +10877,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34585,8 +35265,7 @@
+@@ -34590,8 +35268,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10975,7 +10887,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34681,8 +35360,7 @@
+@@ -34686,8 +35363,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10985,7 +10897,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34748,8 +35426,7 @@
+@@ -34753,8 +35429,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -10995,7 +10907,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34814,8 +35491,7 @@
+@@ -34819,8 +35494,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11005,7 +10917,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34878,8 +35554,7 @@
+@@ -34883,8 +35557,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11015,7 +10927,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -34940,8 +35615,7 @@
+@@ -34945,8 +35618,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11025,7 +10937,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35011,8 +35685,7 @@
+@@ -35016,8 +35688,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11035,7 +10947,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35078,8 +35751,7 @@
+@@ -35083,8 +35754,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11045,7 +10957,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35145,8 +35817,7 @@
+@@ -35150,8 +35820,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11055,7 +10967,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35231,8 +35902,7 @@
+@@ -35236,8 +35905,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11065,7 +10977,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35337,8 +36007,7 @@
+@@ -35342,8 +36010,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11075,7 +10987,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35403,8 +36072,7 @@
+@@ -35408,8 +36075,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11085,7 +10997,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35479,8 +36147,7 @@
+@@ -35484,8 +36150,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11095,7 +11007,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35559,8 +36226,7 @@
+@@ -35564,8 +36229,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11105,7 +11017,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35749,8 +36415,7 @@
+@@ -35754,8 +36418,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11115,7 +11027,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35812,8 +36477,7 @@
+@@ -35817,8 +36480,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11125,7 +11037,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35853,8 +36517,7 @@
+@@ -35858,8 +36520,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11135,7 +11047,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35910,8 +36573,7 @@
+@@ -35915,8 +36576,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11145,7 +11057,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -35951,8 +36613,7 @@
+@@ -35956,8 +36616,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11155,7 +11067,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36016,8 +36677,7 @@
+@@ -36021,8 +36680,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11165,7 +11077,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36048,10 +36708,8 @@
+@@ -36053,10 +36711,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11178,7 +11090,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36163,8 +36821,7 @@
+@@ -36168,8 +36824,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11188,7 +11100,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36226,8 +36883,7 @@
+@@ -36231,8 +36886,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11198,7 +11110,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36267,8 +36923,7 @@
+@@ -36272,8 +36926,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11208,7 +11120,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36324,8 +36979,7 @@
+@@ -36329,8 +36982,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11218,7 +11130,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36365,8 +37019,7 @@
+@@ -36370,8 +37022,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11228,7 +11140,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36430,8 +37083,7 @@
+@@ -36435,8 +37086,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11238,7 +11150,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36462,10 +37114,8 @@
+@@ -36467,10 +37117,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11251,7 +11163,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36577,8 +37227,7 @@
+@@ -36582,8 +37230,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11261,7 +11173,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36640,8 +37289,7 @@
+@@ -36645,8 +37292,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11271,7 +11183,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36681,8 +37329,7 @@
+@@ -36686,8 +37332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11281,7 +11193,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36738,8 +37385,7 @@
+@@ -36743,8 +37388,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11291,7 +11203,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36779,8 +37425,7 @@
+@@ -36784,8 +37428,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11301,7 +11213,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36844,8 +37489,7 @@
+@@ -36849,8 +37492,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11311,7 +11223,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -36876,10 +37520,8 @@
+@@ -36881,10 +37523,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11324,7 +11236,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36991,8 +37633,7 @@
+@@ -36996,8 +37636,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11334,7 +11246,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37054,8 +37695,7 @@
+@@ -37059,8 +37698,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11344,7 +11256,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37095,8 +37735,7 @@
+@@ -37100,8 +37738,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11354,7 +11266,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37152,8 +37791,7 @@
+@@ -37157,8 +37794,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11364,7 +11276,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37193,8 +37831,7 @@
+@@ -37198,8 +37834,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11374,7 +11286,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37258,8 +37895,7 @@
+@@ -37263,8 +37898,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11384,7 +11296,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37290,10 +37926,8 @@
+@@ -37295,10 +37929,8 @@
  esac
  else
    if test "$cross_compiling" = yes; then
@@ -11397,7 +11309,7 @@
     { (exit 1); exit 1; }; }
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37408,8 +38042,7 @@
+@@ -37413,8 +38045,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11407,7 +11319,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37451,8 +38084,7 @@
+@@ -37456,8 +38087,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11417,7 +11329,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37509,8 +38141,7 @@
+@@ -37514,8 +38144,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11427,7 +11339,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37692,8 +38323,7 @@
+@@ -37697,8 +38326,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11437,7 +11349,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37747,9 +38377,6 @@
+@@ -37752,9 +38380,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11447,7 +11359,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37783,8 +38410,7 @@
+@@ -37788,8 +38413,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11457,7 +11369,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37888,8 +38514,7 @@
+@@ -37893,8 +38517,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11467,7 +11379,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -37968,9 +38593,6 @@
+@@ -37973,9 +38596,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11477,7 +11389,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38001,8 +38623,7 @@
+@@ -38006,8 +38626,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11487,7 +11399,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38103,8 +38724,7 @@
+@@ -38108,8 +38727,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11497,7 +11409,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38183,9 +38803,6 @@
+@@ -38188,9 +38806,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11507,7 +11419,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38216,8 +38833,7 @@
+@@ -38221,8 +38836,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11517,7 +11429,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38318,8 +38934,7 @@
+@@ -38323,8 +38937,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11527,7 +11439,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38398,9 +39013,6 @@
+@@ -38403,9 +39016,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11537,7 +11449,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38436,8 +39048,7 @@
+@@ -38441,8 +39051,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11547,7 +11459,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38544,8 +39155,7 @@
+@@ -38549,8 +39158,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11557,7 +11469,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38624,9 +39234,6 @@
+@@ -38629,9 +39237,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11567,7 +11479,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38661,8 +39268,7 @@
+@@ -38666,8 +39271,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11577,7 +11489,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38767,8 +39373,7 @@
+@@ -38772,8 +39376,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11587,7 +11499,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38847,9 +39452,6 @@
+@@ -38852,9 +39455,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11597,7 +11509,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38882,8 +39484,7 @@
+@@ -38887,8 +39487,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11607,7 +11519,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -38986,8 +39587,7 @@
+@@ -38991,8 +39590,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11617,7 +11529,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39066,9 +39666,6 @@
+@@ -39071,9 +39669,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11627,7 +11539,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39101,8 +39698,7 @@
+@@ -39106,8 +39701,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11637,7 +11549,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39205,8 +39801,7 @@
+@@ -39210,8 +39804,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11647,7 +11559,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39284,9 +39879,6 @@
+@@ -39289,9 +39882,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -11657,7 +11569,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39319,8 +39911,7 @@
+@@ -39324,8 +39914,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11667,7 +11579,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39423,8 +40014,7 @@
+@@ -39428,8 +40017,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11677,7 +11589,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39518,8 +40108,7 @@
+@@ -39523,8 +40111,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11687,7 +11599,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39706,8 +40295,7 @@
+@@ -39713,8 +40300,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11697,7 +11609,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39777,8 +40365,7 @@
+@@ -39784,8 +40370,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11707,7 +11619,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39931,8 +40518,7 @@
+@@ -39938,8 +40523,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11717,7 +11629,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40466,8 +41052,7 @@
+@@ -40473,8 +41057,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11727,7 +11639,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40758,8 +41343,7 @@
+@@ -40765,8 +41348,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11737,7 +11649,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40904,8 +41488,7 @@
+@@ -40911,8 +41493,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11747,7 +11659,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40991,8 +41574,7 @@
+@@ -40998,8 +41579,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11757,7 +11669,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41054,8 +41636,7 @@
+@@ -41061,8 +41641,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11767,7 +11679,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41126,8 +41707,7 @@
+@@ -41133,8 +41712,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11777,7 +11689,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41217,8 +41797,7 @@
+@@ -41224,8 +41802,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11787,7 +11699,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41292,8 +41871,7 @@
+@@ -41299,8 +41876,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11797,7 +11709,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41403,8 +41981,7 @@
+@@ -41410,8 +41986,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11807,7 +11719,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41573,8 +42150,7 @@
+@@ -41580,8 +42155,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11817,16 +11729,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41636,7 +42212,7 @@
+@@ -41643,7 +42217,7 @@
  do
    for j in qsql.html;
    do
--    echo "configure: 41639: $i/$j" >&5
-+    echo "configure: 42215: $i/$j" >&5
+-    echo "configure: 41646: $i/$j" >&5
++    echo "configure: 42220: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -41981,8 +42557,7 @@
+@@ -41996,8 +42570,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11836,7 +11748,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42075,8 +42650,7 @@
+@@ -42090,8 +42663,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11846,16 +11758,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42248,7 +42822,7 @@
+@@ -42263,7 +42835,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 42251: $i/$j" >&5
-+    echo "configure: 42825: $i/$j" >&5
+-    echo "configure: 42266: $i/$j" >&5
++    echo "configure: 42838: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -42303,8 +42877,7 @@
+@@ -42318,8 +42890,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11865,7 +11777,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42553,8 +43126,7 @@
+@@ -42568,8 +43139,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11875,7 +11787,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42603,8 +43175,7 @@
+@@ -42618,8 +43188,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11885,7 +11797,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42707,8 +43278,7 @@
+@@ -42722,8 +43291,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11895,7 +11807,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42774,8 +43344,7 @@
+@@ -42789,8 +43357,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11905,7 +11817,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43033,8 +43602,7 @@
+@@ -43048,8 +43615,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11915,7 +11827,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43099,8 +43667,7 @@
+@@ -43114,8 +43680,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11925,7 +11837,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43250,8 +43817,7 @@
+@@ -43265,8 +43830,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11935,7 +11847,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43404,8 +43970,7 @@
+@@ -43419,8 +43983,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11945,7 +11857,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43509,8 +44074,7 @@
+@@ -43524,8 +44087,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11955,7 +11867,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43629,8 +44193,7 @@
+@@ -43644,8 +44206,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11965,7 +11877,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43761,8 +44324,7 @@
+@@ -43776,8 +44337,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11975,7 +11887,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44155,8 +44717,7 @@
+@@ -44171,8 +44731,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11985,7 +11897,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44326,8 +44887,7 @@
+@@ -44342,8 +44901,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -11995,7 +11907,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44379,13 +44939,13 @@
+@@ -44395,13 +44953,13 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -12013,7 +11925,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -44417,8 +44977,7 @@
+@@ -44433,8 +44991,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12023,7 +11935,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44430,20 +44989,20 @@
+@@ -44446,20 +45003,20 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -12049,7 +11961,7 @@
    ac_font_enc_lib=1
  else
    ac_font_enc_lib=0
-@@ -44453,7 +45012,7 @@
+@@ -44469,7 +45026,7 @@
       LIBS="$kde_save_LIBS"
  
              if test "$ac_font_enc_lib" = "1"; then
@@ -12058,7 +11970,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_FONT_ENC 1
-@@ -44504,8 +45063,7 @@
+@@ -44520,8 +45077,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12068,7 +11980,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44735,8 +45293,7 @@
+@@ -44751,8 +45307,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12078,7 +11990,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44802,8 +45359,7 @@
+@@ -44818,8 +45373,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12088,7 +12000,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44849,8 +45405,7 @@
+@@ -44865,8 +45419,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12098,7 +12010,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44930,8 +45485,7 @@
+@@ -44946,8 +45499,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12108,7 +12020,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45021,8 +45575,7 @@
+@@ -45037,8 +45589,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12118,7 +12030,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45150,8 +45703,7 @@
+@@ -45166,8 +45717,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12128,7 +12040,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45248,8 +45800,7 @@
+@@ -45264,8 +45814,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12138,7 +12050,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45336,8 +45887,7 @@
+@@ -45352,8 +45901,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12148,53 +12060,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45470,10 +46020,7 @@
- 
- 
- case "$host" in
--  *-*-linux*)
--	FOUND_USBVIEW=yes
--	;;
--  *-*-freebsd*)
-+  *-*-linux*|*-*-freebsd*)
- 	FOUND_USBVIEW=yes
- 	;;
- esac
-@@ -45490,6 +46037,33 @@
- 
- 
- 
-+# Check whether --with-usbids or --without-usbids was given.
-+if test "${with_usbids+set}" = set; then
-+  withval="$with_usbids"
-+
-+fi;
-+
-+if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define USBIDS_FILE "$with_usbids"
-+_ACEOF
-+
-+  dont_install_usbids="yes"
-+fi
-+
-+
-+
-+if test "x$dont_install_usbids" != "xyes"; then
-+  install_usbids_TRUE=
-+  install_usbids_FALSE='#'
-+else
-+  install_usbids_TRUE='#'
-+  install_usbids_FALSE=
-+fi
-+
-+
-+
- # Check whether --with-libraw1394 or --without-libraw1394 was given.
- if test "${with_libraw1394+set}" = set; then
-   withval="$with_libraw1394"
-@@ -45544,8 +46118,7 @@
+@@ -45584,8 +46132,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12204,7 +12070,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45754,8 +46327,7 @@
+@@ -45794,8 +46341,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12214,7 +12080,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45833,8 +46405,7 @@
+@@ -45881,8 +46427,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12224,7 +12090,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45897,8 +46468,7 @@
+@@ -45945,8 +46490,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12234,7 +12100,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -45982,8 +46552,7 @@
+@@ -46030,8 +46574,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12244,7 +12110,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46063,8 +46632,7 @@
+@@ -46111,8 +46654,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12254,7 +12120,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46165,8 +46733,7 @@
+@@ -46214,8 +46756,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12264,7 +12130,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46229,8 +46796,7 @@
+@@ -46278,8 +46819,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12274,7 +12140,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46319,8 +46885,7 @@
+@@ -46368,8 +46908,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12284,7 +12150,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46430,8 +46995,7 @@
+@@ -46479,8 +47018,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12294,7 +12160,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46528,8 +47092,7 @@
+@@ -46577,8 +47115,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12304,7 +12170,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46760,8 +47323,7 @@
+@@ -46809,8 +47346,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12314,7 +12180,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -46992,8 +47554,7 @@
+@@ -47041,8 +47577,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12324,7 +12190,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47093,8 +47654,7 @@
+@@ -47143,8 +47678,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12334,7 +12200,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47192,8 +47752,7 @@
+@@ -47242,8 +47776,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12344,7 +12210,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47261,8 +47820,7 @@
+@@ -47311,8 +47844,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12354,7 +12220,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47306,8 +47864,7 @@
+@@ -47356,8 +47888,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12364,7 +12230,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47373,8 +47930,7 @@
+@@ -47423,8 +47954,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12374,7 +12240,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47418,8 +47974,7 @@
+@@ -47468,8 +47998,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12384,7 +12250,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47488,8 +48043,7 @@
+@@ -47538,8 +48067,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12394,7 +12260,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47536,8 +48090,7 @@
+@@ -47586,8 +48114,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12404,7 +12270,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47647,8 +48200,7 @@
+@@ -47697,8 +48224,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12414,7 +12280,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47755,8 +48307,7 @@
+@@ -47805,8 +48331,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12424,7 +12290,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47858,8 +48409,7 @@
+@@ -47908,8 +48433,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12434,7 +12300,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -47970,8 +48520,7 @@
+@@ -48020,8 +48544,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12444,7 +12310,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48040,8 +48589,7 @@
+@@ -48090,8 +48613,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12454,7 +12320,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48117,8 +48665,7 @@
+@@ -48167,8 +48689,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12464,7 +12330,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48174,8 +48721,7 @@
+@@ -48224,8 +48745,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12474,7 +12340,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48281,8 +48827,7 @@
+@@ -48331,8 +48851,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12484,7 +12350,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48391,8 +48936,7 @@
+@@ -48441,8 +48960,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12494,7 +12360,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48495,8 +49039,7 @@
+@@ -48545,8 +49063,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12504,7 +12370,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48564,8 +49107,7 @@
+@@ -48614,8 +49131,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12514,7 +12380,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48655,8 +49197,7 @@
+@@ -48705,8 +49221,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12524,7 +12390,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -48832,8 +49373,7 @@
+@@ -48882,8 +49397,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12534,7 +12400,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49140,8 +49680,7 @@
+@@ -49190,8 +49704,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12544,25 +12410,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49237,14 +49776,17 @@
- #define HAVE_ARTS 1
- _ACEOF
- 
-+        KHOTKEYS_ARTS_SUBDIR=arts
- else
- 	LIB_ARTS=""
- 	ARTS_CFLAGS=""
-+        KHOTKEYS_ARTS_SUBDIR=
- fi
- 
- 
- 
- 
-+
- case "$host" in
-   *-*-freebsd*) LIB_KVM="-lkvm" ;;
-   *) LIB_KVM=""  ;;
-@@ -49285,8 +49827,7 @@
+@@ -49338,8 +49851,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12572,7 +12420,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49440,8 +49981,7 @@
+@@ -49494,8 +50006,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12582,7 +12430,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49527,8 +50067,7 @@
+@@ -49581,8 +50092,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12592,7 +12440,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49609,8 +50148,7 @@
+@@ -49664,8 +50174,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12602,7 +12450,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49696,8 +50234,7 @@
+@@ -49751,8 +50260,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12612,16 +12460,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -49782,7 +50319,7 @@
+@@ -49837,7 +50345,7 @@
  do
    for j in openssl/ssl.h;
    do
--    echo "configure: 49785: $i/$j" >&5
-+    echo "configure: 50322: $i/$j" >&5
+-    echo "configure: 49840: $i/$j" >&5
++    echo "configure: 50348: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -49837,8 +50374,7 @@
+@@ -49892,8 +50400,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12631,7 +12479,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50075,8 +50611,7 @@
+@@ -50130,8 +50637,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12641,7 +12489,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50248,8 +50783,7 @@
+@@ -50303,8 +50809,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12651,7 +12499,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50420,8 +50954,7 @@
+@@ -50475,8 +50980,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12661,7 +12509,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50513,8 +51046,7 @@
+@@ -50568,8 +51072,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12671,7 +12519,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50603,8 +51135,7 @@
+@@ -50658,8 +51161,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12681,7 +12529,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50693,8 +51224,7 @@
+@@ -50748,8 +51250,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12691,7 +12539,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50788,8 +51318,7 @@
+@@ -50843,8 +51344,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12701,7 +12549,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -50893,8 +51422,7 @@
+@@ -50948,8 +51448,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12711,7 +12559,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51083,8 +51611,7 @@
+@@ -51138,8 +51637,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12721,25 +12569,25 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51142,7 +51669,7 @@
+@@ -51197,7 +51695,7 @@
  do
    for j in ldap.h;
    do
--    echo "configure: 51145: $i/$j" >&5
-+    echo "configure: 51672: $i/$j" >&5
+-    echo "configure: 51200: $i/$j" >&5
++    echo "configure: 51698: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ldap_incdir=$i
-@@ -51164,7 +51691,7 @@
+@@ -51219,7 +51717,7 @@
  do
    for j in libldap.$ext;
    do
--    echo "configure: 51167: $i/$j" >&5
-+    echo "configure: 51694: $i/$j" >&5
+-    echo "configure: 51222: $i/$j" >&5
++    echo "configure: 51720: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ldap_libdir=$i
-@@ -51260,8 +51787,7 @@
+@@ -51315,8 +51813,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12749,7 +12597,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51354,8 +51880,7 @@
+@@ -51409,8 +51906,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12759,7 +12607,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51450,8 +51975,7 @@
+@@ -51505,8 +52001,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12769,88 +12617,88 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -51598,7 +52122,7 @@
+@@ -51653,7 +52148,7 @@
  do
    for j in libhal.h libhal-storage.h;
    do
--    echo "configure: 51601: $i/$j" >&5
-+    echo "configure: 52125: $i/$j" >&5
+-    echo "configure: 51656: $i/$j" >&5
++    echo "configure: 52151: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        hal_incdir=$i
-@@ -51633,7 +52157,7 @@
+@@ -51688,7 +52183,7 @@
  do
    for j in libhal.so libhal-storage.so;
    do
--    echo "configure: 51636: $i/$j" >&5
-+    echo "configure: 52160: $i/$j" >&5
+-    echo "configure: 51691: $i/$j" >&5
++    echo "configure: 52186: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        hal_libdir=$i
-@@ -51786,7 +52310,7 @@
+@@ -51841,7 +52336,7 @@
  do
    for j in dbus/dbus.h;
    do
--    echo "configure: 51789: $i/$j" >&5
-+    echo "configure: 52313: $i/$j" >&5
+-    echo "configure: 51844: $i/$j" >&5
++    echo "configure: 52339: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_incdir=$i
-@@ -51803,7 +52327,7 @@
+@@ -51858,7 +52353,7 @@
  do
    for j in dbus/dbus-arch-deps.h;
    do
--    echo "configure: 51806: $i/$j" >&5
-+    echo "configure: 52330: $i/$j" >&5
+-    echo "configure: 51861: $i/$j" >&5
++    echo "configure: 52356: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_incdir_arch_deps=$i
-@@ -51825,7 +52349,7 @@
+@@ -51880,7 +52375,7 @@
  do
    for j in libdbus-1.so;
    do
--    echo "configure: 51828: $i/$j" >&5
-+    echo "configure: 52352: $i/$j" >&5
+-    echo "configure: 51883: $i/$j" >&5
++    echo "configure: 52378: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbus_libdir=$i
-@@ -51975,7 +52499,7 @@
+@@ -52030,7 +52525,7 @@
  do
    for j in dbus/connection.h;
    do
--    echo "configure: 51978: $i/$j" >&5
-+    echo "configure: 52502: $i/$j" >&5
+-    echo "configure: 52033: $i/$j" >&5
++    echo "configure: 52528: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_incdir=$i
-@@ -52002,7 +52526,7 @@
+@@ -52057,7 +52552,7 @@
  do
    for j in libdbus-qt-1.so;
    do
--    echo "configure: 52005: $i/$j" >&5
-+    echo "configure: 52529: $i/$j" >&5
+-    echo "configure: 52060: $i/$j" >&5
++    echo "configure: 52555: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_libdir=$i
-@@ -52026,7 +52550,7 @@
+@@ -52081,7 +52576,7 @@
  do
    for j in dbus/connection.h;
    do
--    echo "configure: 52029: $i/$j" >&5
-+    echo "configure: 52553: $i/$j" >&5
+-    echo "configure: 52084: $i/$j" >&5
++    echo "configure: 52579: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_incdir=$i
-@@ -52052,7 +52576,7 @@
+@@ -52107,7 +52602,7 @@
  do
    for j in libdbus-qt-1.so;
    do
--    echo "configure: 52055: $i/$j" >&5
-+    echo "configure: 52579: $i/$j" >&5
+-    echo "configure: 52110: $i/$j" >&5
++    echo "configure: 52605: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        dbusqt_libdir=$i
-@@ -52178,8 +52702,7 @@
+@@ -52233,8 +52728,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12860,7 +12708,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52208,8 +52731,7 @@
+@@ -52263,8 +52757,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12870,7 +12718,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52279,8 +52801,7 @@
+@@ -52334,8 +52827,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12880,7 +12728,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52332,8 +52853,7 @@
+@@ -52387,8 +52879,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12890,7 +12738,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52404,8 +52924,7 @@
+@@ -52459,8 +52950,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12900,7 +12748,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52457,8 +52976,7 @@
+@@ -52512,8 +53002,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12910,7 +12758,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52560,8 +53078,7 @@
+@@ -52615,8 +53104,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12920,7 +12768,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52730,8 +53247,7 @@
+@@ -52785,8 +53273,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12930,7 +12778,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52837,8 +53353,7 @@
+@@ -52892,8 +53379,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12940,7 +12788,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -52913,8 +53428,7 @@
+@@ -52968,8 +53454,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12950,7 +12798,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53102,8 +53616,7 @@
+@@ -53157,8 +53642,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12960,7 +12808,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53232,8 +53745,7 @@
+@@ -53287,8 +53771,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12970,7 +12818,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53319,8 +53831,7 @@
+@@ -53374,8 +53857,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12980,7 +12828,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53388,8 +53899,7 @@
+@@ -53443,8 +53925,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -12990,7 +12838,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -53444,8 +53954,7 @@
+@@ -53499,8 +53980,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13000,7 +12848,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54069,8 +54578,7 @@
+@@ -54124,8 +54604,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13010,7 +12858,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54149,8 +54657,7 @@
+@@ -54212,8 +54691,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13020,7 +12868,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54213,8 +54720,7 @@
+@@ -54276,8 +54754,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13030,7 +12878,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54424,8 +54930,7 @@
+@@ -54489,8 +54966,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13040,7 +12888,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54595,8 +55100,7 @@
+@@ -54660,8 +55136,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13050,7 +12898,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54706,8 +55210,7 @@
+@@ -54771,8 +55246,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13060,7 +12908,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54806,8 +55309,7 @@
+@@ -54871,8 +55345,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13070,7 +12918,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54893,8 +55395,7 @@
+@@ -54958,8 +55431,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13080,7 +12928,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -54980,8 +55481,7 @@
+@@ -55045,8 +55517,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13090,7 +12938,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -55079,8 +55579,7 @@
+@@ -55147,8 +55618,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13100,7 +12948,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -55236,8 +55735,7 @@
+@@ -55304,8 +55774,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13110,7 +12958,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -55317,8 +55815,7 @@
+@@ -55385,8 +55854,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -13120,16 +12968,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -56384,6 +56881,8 @@
- 
- ac_config_files="$ac_config_files khotkeys/app/Makefile"
- 
-+ac_config_files="$ac_config_files khotkeys/arts/Makefile"
-+
- ac_config_files="$ac_config_files khotkeys/data/Makefile"
- 
- ac_config_files="$ac_config_files khotkeys/kcontrol/Makefile"
-@@ -56915,6 +57414,13 @@
+@@ -56983,6 +57451,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -13143,29 +12982,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
-@@ -57027,6 +57533,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+if test -z "${install_usbids_TRUE}" && test -z "${install_usbids_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"install_usbids\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"install_usbids\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- if test -z "${include_kcontrol_view1394_TRUE}" && test -z "${include_kcontrol_view1394_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"include_kcontrol_view1394\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -58176,6 +58689,7 @@
-   "khelpcenter/searchhandlers/Makefile" ) CONFIG_FILES="$CONFIG_FILES khelpcenter/searchhandlers/Makefile" ;;
-   "khotkeys/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/Makefile" ;;
-   "khotkeys/app/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/app/Makefile" ;;
-+  "khotkeys/arts/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/arts/Makefile" ;;
-   "khotkeys/data/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/data/Makefile" ;;
-   "khotkeys/kcontrol/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/Makefile" ;;
-   "khotkeys/kcontrol/ui/Makefile" ) CONFIG_FILES="$CONFIG_FILES khotkeys/kcontrol/ui/Makefile" ;;
-@@ -58517,6 +59031,9 @@
+@@ -58592,6 +59067,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
  s, at am__untar@,$am__untar,;t t
@@ -13175,24 +12992,7 @@
  s, at KDECONFIG@,$KDECONFIG,;t t
  s, at kde_libs_prefix@,$kde_libs_prefix,;t t
  s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -58767,6 +59284,8 @@
- s, at include_kcontrol_smartcard_FALSE@,$include_kcontrol_smartcard_FALSE,;t t
- s, at include_kcontrol_usbview_TRUE@,$include_kcontrol_usbview_TRUE,;t t
- s, at include_kcontrol_usbview_FALSE@,$include_kcontrol_usbview_FALSE,;t t
-+s, at install_usbids_TRUE@,$install_usbids_TRUE,;t t
-+s, at install_usbids_FALSE@,$install_usbids_FALSE,;t t
- s, at include_kcontrol_view1394_TRUE@,$include_kcontrol_view1394_TRUE,;t t
- s, at include_kcontrol_view1394_FALSE@,$include_kcontrol_view1394_FALSE,;t t
- s, at LIB_XSS@,$LIB_XSS,;t t
-@@ -58783,6 +59302,7 @@
- s, at KRB5_RPATH@,$KRB5_RPATH,;t t
- s, at LIB_ARTS@,$LIB_ARTS,;t t
- s, at ARTS_CFLAGS@,$ARTS_CFLAGS,;t t
-+s, at KHOTKEYS_ARTS_SUBDIR@,$KHOTKEYS_ARTS_SUBDIR,;t t
- s, at LIB_KVM@,$LIB_KVM,;t t
- s, at LIB_XCOMPOSITE@,$LIB_XCOMPOSITE,;t t
- s, at LIB_XFIXES@,$LIB_XFIXES,;t t
-@@ -59102,11 +59622,6 @@
+@@ -59180,11 +59658,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -13204,7 +13004,7 @@
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -59145,6 +59660,12 @@
+@@ -59223,6 +59696,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -13221,14 +13021,14 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdebase, "3.5.0") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdebase, "3.5.1") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -611,9 +613,9 @@
+@@ -618,9 +620,9 @@
              ld_shared_flag=
              KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
              LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
@@ -13240,125 +13040,9 @@
                  AC_DEFINE(HAVE_FONT_ENC, 1, [Defines if you have FontEnc])
              fi
              LDFLAGS="$ac_LDFLAGS_save"
-@@ -708,15 +710,21 @@
- dnl =======================================================
- 
- case "$host" in
--  *-*-linux*)
--	FOUND_USBVIEW=yes
--	;;
--  *-*-freebsd*)
-+  *-*-linux*|*-*-freebsd*)
- 	FOUND_USBVIEW=yes
- 	;;
- esac
- 
- AM_CONDITIONAL(include_kcontrol_usbview, test "$FOUND_USBVIEW" = "yes")
-+
-+AC_ARG_WITH([usbids], AC_HELP_STRING([--with-usbids=PATH], [Use the usb.ids file at the specified path, instead of the local copy]))
-+
-+if test "x$with_usbids" != "x" && test "x$with_usbids" != "xno"; then
-+  AC_DEFINE_UNQUOTED(USBIDS_FILE, "$with_usbids", [Path for the usb.ids file to use])
-+  dont_install_usbids="yes"
-+fi
-+
-+AM_CONDITIONAL(install_usbids, test "x$dont_install_usbids" != "xyes")
- dnl =======================================================
- dnl FILE: ./kcontrol/view1394/configure.in.in
- dnl =======================================================
-@@ -1212,13 +1220,16 @@
- 	ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
- 	ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
- 	AC_DEFINE(HAVE_ARTS, 1, [Defined for arts support in khotkeys])
-+        KHOTKEYS_ARTS_SUBDIR=arts
- else
- 	LIB_ARTS=""
- 	ARTS_CFLAGS=""
-+        KHOTKEYS_ARTS_SUBDIR=
- fi
- 
- AC_SUBST(LIB_ARTS)
- AC_SUBST(ARTS_CFLAGS)
-+AC_SUBST(KHOTKEYS_ARTS_SUBDIR)
- dnl =======================================================
- dnl FILE: ./kicker/applets/naughty/configure.in.in
- dnl =======================================================
-@@ -2393,6 +2404,7 @@
- AC_CONFIG_FILES([ khelpcenter/searchhandlers/Makefile ])
- AC_CONFIG_FILES([ khotkeys/Makefile ])
- AC_CONFIG_FILES([ khotkeys/app/Makefile ])
-+AC_CONFIG_FILES([ khotkeys/arts/Makefile ])
- AC_CONFIG_FILES([ khotkeys/data/Makefile ])
- AC_CONFIG_FILES([ khotkeys/kcontrol/Makefile ])
- AC_CONFIG_FILES([ khotkeys/kcontrol/ui/Makefile ])
---- doc/Makefile.in
-+++ doc/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -554,13 +560,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 =. 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
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -598,9 +604,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- doc/faq/Makefile.in
 +++ doc/faq/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13368,16 +13052,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13386,7 +13061,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13398,7 +13073,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,10 +732,10 @@
+@@ -729,10 +732,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -13411,7 +13086,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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/faq
@@ -13437,15 +13112,7 @@
  
 --- doc/glossary/Makefile.in
 +++ doc/glossary/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13455,16 +13122,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13473,7 +13131,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13485,7 +13143,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +735,7 @@
+@@ -732,7 +735,7 @@
  KDE_DIST=kdeprintingglossary.docbook index.docbook Makefile.in checkxrefs Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -13494,7 +13152,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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/glossary
@@ -13520,15 +13178,7 @@
  
 --- doc/kappfinder/Makefile.in
 +++ doc/kappfinder/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13538,16 +13188,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -542,7 +548,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13556,7 +13197,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +586,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13570,15 +13211,7 @@
  mostlyclean-libtool:
 --- doc/kate/Makefile.in
 +++ doc/kate/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13588,16 +13221,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -542,7 +548,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13606,7 +13230,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +586,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13618,7 +13242,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -730,7 +736,7 @@
+@@ -733,7 +736,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
@@ -13627,7 +13251,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
-@@ -757,20 +763,20 @@
+@@ -760,20 +763,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kate
@@ -13651,109 +13275,9 @@
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
---- doc/kcontrol/Makefile.in
-+++ doc/kcontrol/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,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 =. 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
-@@ -560,7 +566,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -598,9 +604,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -896,7 +902,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
-@@ -923,20 +929,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/arts/Makefile.in
 +++ doc/kcontrol/arts/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13763,16 +13287,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13781,7 +13296,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13793,7 +13308,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +735,7 @@
+@@ -732,7 +735,7 @@
  KDE_DIST=midi.docbook index.docbook Makefile.in Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -13802,7 +13317,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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/arts
@@ -13828,15 +13343,7 @@
  
 --- doc/kcontrol/background/Makefile.in
 +++ doc/kcontrol/background/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13846,16 +13353,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13864,7 +13362,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13878,15 +13376,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/bell/Makefile.in
 +++ doc/kcontrol/bell/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13896,16 +13386,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13914,7 +13395,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13928,15 +13409,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/cache/Makefile.in
 +++ doc/kcontrol/cache/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13946,16 +13419,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -13964,7 +13428,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13978,15 +13442,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/clock/Makefile.in
 +++ doc/kcontrol/clock/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13996,16 +13452,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14014,7 +13461,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14028,15 +13475,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/colors/Makefile.in
 +++ doc/kcontrol/colors/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14046,16 +13485,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14064,7 +13494,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14078,15 +13508,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/cookies/Makefile.in
 +++ doc/kcontrol/cookies/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14096,16 +13518,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14114,7 +13527,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14128,15 +13541,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/crypto/Makefile.in
 +++ doc/kcontrol/crypto/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14146,16 +13551,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14164,7 +13560,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14178,15 +13574,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/desktop/Makefile.in
 +++ doc/kcontrol/desktop/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14196,16 +13584,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14214,7 +13593,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14228,15 +13607,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/desktopbehavior/Makefile.in
 +++ doc/kcontrol/desktopbehavior/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14246,16 +13617,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14264,7 +13626,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14278,15 +13640,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/ebrowsing/Makefile.in
 +++ doc/kcontrol/ebrowsing/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14296,16 +13650,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14314,7 +13659,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14328,15 +13673,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/email/Makefile.in
 +++ doc/kcontrol/email/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14346,16 +13683,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14364,7 +13692,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14378,15 +13706,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/energy/Makefile.in
 +++ doc/kcontrol/energy/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14396,16 +13716,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14414,7 +13725,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14428,15 +13739,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/filemanager/Makefile.in
 +++ doc/kcontrol/filemanager/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14446,16 +13749,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14464,7 +13758,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14476,7 +13770,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +735,7 @@
+@@ -732,7 +735,7 @@
  KDE_DIST=kfileman1.png index.docbook Makefile.in kfileman2.png Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -14485,7 +13779,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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/filemanager
@@ -14511,15 +13805,7 @@
  
 --- doc/kcontrol/filetypes/Makefile.in
 +++ doc/kcontrol/filetypes/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14529,16 +13815,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14547,7 +13824,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14561,15 +13838,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/fonts/Makefile.in
 +++ doc/kcontrol/fonts/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14579,16 +13848,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14597,7 +13857,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14611,15 +13871,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/helpindex/Makefile.in
 +++ doc/kcontrol/helpindex/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14629,16 +13881,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14647,7 +13890,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14661,15 +13904,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/icons/Makefile.in
 +++ doc/kcontrol/icons/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14679,16 +13914,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14697,7 +13923,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14711,15 +13937,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmaccess/Makefile.in
 +++ doc/kcontrol/kcmaccess/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14729,16 +13947,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14747,7 +13956,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14761,15 +13970,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmcss/Makefile.in
 +++ doc/kcontrol/kcmcss/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14779,16 +13980,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14797,7 +13989,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14811,15 +14003,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmfontinst/Makefile.in
 +++ doc/kcontrol/kcmfontinst/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14829,16 +14013,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14847,7 +14022,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14861,15 +14036,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmkonsole/Makefile.in
 +++ doc/kcontrol/kcmkonsole/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14879,16 +14046,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14897,7 +14055,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14911,15 +14069,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmlaunch/Makefile.in
 +++ doc/kcontrol/kcmlaunch/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14929,16 +14079,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14947,7 +14088,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14961,15 +14102,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmnotify/Makefile.in
 +++ doc/kcontrol/kcmnotify/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -14979,16 +14112,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -14997,7 +14121,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15011,15 +14135,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmsmserver/Makefile.in
 +++ doc/kcontrol/kcmsmserver/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15029,16 +14145,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15047,7 +14154,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15061,15 +14168,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmstyle/Makefile.in
 +++ doc/kcontrol/kcmstyle/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15079,16 +14178,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15097,7 +14187,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15111,15 +14201,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kcmtaskbar/Makefile.in
 +++ doc/kcontrol/kcmtaskbar/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15129,16 +14211,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15147,7 +14220,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15161,15 +14234,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/kdm/Makefile.in
 +++ doc/kcontrol/kdm/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15179,16 +14244,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15197,7 +14253,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15211,15 +14267,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/keyboard/Makefile.in
 +++ doc/kcontrol/keyboard/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15229,16 +14277,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15247,7 +14286,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15261,15 +14300,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/keys/Makefile.in
 +++ doc/kcontrol/keys/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15279,16 +14310,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15297,7 +14319,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15311,15 +14333,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/khtml/Makefile.in
 +++ doc/kcontrol/khtml/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15329,16 +14343,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15347,7 +14352,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15359,7 +14364,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +735,7 @@
+@@ -732,7 +735,7 @@
  KDE_DIST=index.docbook nsplugin.docbook Makefile.in Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -15368,7 +14373,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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcontrol/khtml
@@ -15394,15 +14399,7 @@
  
 --- doc/kcontrol/kwindecoration/Makefile.in
 +++ doc/kcontrol/kwindecoration/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15412,16 +14409,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15430,7 +14418,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15444,15 +14432,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/language/Makefile.in
 +++ doc/kcontrol/language/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15462,16 +14442,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15480,7 +14451,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15492,17 +14463,84 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- doc/kcontrol/Makefile.in
++++ doc/kcontrol/Makefile.in
+@@ -267,6 +267,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -555,7 +558,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 =. 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 +566,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -601,9 +604,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -899,7 +902,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 +929,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
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15512,16 +14550,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15530,7 +14559,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15544,15 +14573,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/netpref/Makefile.in
 +++ doc/kcontrol/netpref/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15562,16 +14583,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15580,7 +14592,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15594,15 +14606,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/panel/Makefile.in
 +++ doc/kcontrol/panel/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15612,16 +14616,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15630,7 +14625,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15644,15 +14639,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/panelappearance/Makefile.in
 +++ doc/kcontrol/panelappearance/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15662,16 +14649,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15680,7 +14658,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15694,15 +14672,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/passwords/Makefile.in
 +++ doc/kcontrol/passwords/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15712,16 +14682,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15730,7 +14691,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15744,15 +14705,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/performance/Makefile.in
 +++ doc/kcontrol/performance/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15762,16 +14715,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15780,7 +14724,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15794,15 +14738,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/proxy/Makefile.in
 +++ doc/kcontrol/proxy/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15812,16 +14748,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15830,7 +14757,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15844,15 +14771,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/screensaver/Makefile.in
 +++ doc/kcontrol/screensaver/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15862,16 +14781,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15880,7 +14790,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15894,15 +14804,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/smb/Makefile.in
 +++ doc/kcontrol/smb/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15912,16 +14814,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15930,7 +14823,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15944,15 +14837,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/spellchecking/Makefile.in
 +++ doc/kcontrol/spellchecking/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15962,16 +14847,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -15980,7 +14856,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15994,15 +14870,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/useragent/Makefile.in
 +++ doc/kcontrol/useragent/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16012,16 +14880,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16030,7 +14889,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16044,15 +14903,7 @@
  mostlyclean-libtool:
 --- doc/kcontrol/windowmanagement/Makefile.in
 +++ doc/kcontrol/windowmanagement/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16062,16 +14913,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16080,7 +14922,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16094,15 +14936,7 @@
  mostlyclean-libtool:
 --- doc/kdcop/Makefile.in
 +++ doc/kdcop/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16112,16 +14946,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16130,7 +14955,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16144,15 +14969,7 @@
  mostlyclean-libtool:
 --- doc/kdebugdialog/Makefile.in
 +++ doc/kdebugdialog/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16162,16 +14979,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16180,7 +14988,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16194,15 +15002,7 @@
  mostlyclean-libtool:
 --- doc/kdeprint/Makefile.in
 +++ doc/kdeprint/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16212,16 +15012,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16230,7 +15021,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16242,7 +15033,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,10 +732,10 @@
+@@ -729,10 +732,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -16255,7 +15046,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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
@@ -16281,15 +15072,7 @@
  
 --- doc/kdesu/Makefile.in
 +++ doc/kdesu/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16299,16 +15082,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -542,7 +548,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16317,7 +15091,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +586,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16331,15 +15105,7 @@
  mostlyclean-libtool:
 --- doc/kdm/Makefile.in
 +++ doc/kdm/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16349,16 +15115,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -542,7 +548,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16367,7 +15124,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +586,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16379,29 +15136,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -722,9 +728,8 @@
- 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- 	uninstall-info-am
- 
--ref: $(srcdir)/kdmrc-ref.docbook
--$(srcdir)/kdmrc-ref.docbook: $(conf_def) $(top_srcdir)/kdm/confproc.pl
--	$(PERL) -w $(top_srcdir)/kdm/confproc.pl --doc $(conf_def) $@
-+ref: $(conf_def) $(top_srcdir)/kdm/confproc.pl
-+	$(PERL) -w $(top_srcdir)/kdm/confproc.pl --doc $(conf_def) kdmrc-ref.docbook
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
 --- doc/kfind/Makefile.in
 +++ doc/kfind/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16411,16 +15148,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -542,7 +548,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16429,7 +15157,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +586,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16443,15 +15171,7 @@
  mostlyclean-libtool:
 --- doc/khelpcenter/Makefile.in
 +++ doc/khelpcenter/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16461,16 +15181,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -560,7 +566,7 @@
+@@ -563,7 +566,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -16479,7 +15190,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +604,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16491,7 +15202,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -896,7 +902,7 @@
+@@ -899,7 +902,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 
  
  #>+ 24
@@ -16500,7 +15211,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
-@@ -923,20 +929,20 @@
+@@ -926,20 +929,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter
@@ -16526,15 +15237,7 @@
  
 --- doc/kicker/Makefile.in
 +++ doc/kicker/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16544,16 +15247,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -542,7 +548,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16562,7 +15256,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +586,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16574,7 +15268,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -727,10 +733,10 @@
+@@ -730,10 +733,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -16587,7 +15281,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
-@@ -757,20 +763,20 @@
+@@ -760,20 +763,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kicker
@@ -16611,17 +15305,9 @@
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
---- doc/kinfocenter/Makefile.in
-+++ doc/kinfocenter/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+--- doc/kinfocenter/devices/Makefile.in
++++ doc/kinfocenter/devices/Makefile.in
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16631,26 +15317,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,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 =. 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
-@@ -560,7 +566,7 @@
- all: docs-am  all-recursive
+@@ -544,7 +547,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -16658,7 +15326,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +604,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16670,17 +15338,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kinfocenter/devices/Makefile.in
-+++ doc/kinfocenter/devices/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+--- doc/kinfocenter/dma/Makefile.in
++++ doc/kinfocenter/dma/Makefile.in
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16690,16 +15350,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16708,7 +15359,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16720,17 +15371,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kinfocenter/dma/Makefile.in
-+++ doc/kinfocenter/dma/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+--- doc/kinfocenter/interrupts/Makefile.in
++++ doc/kinfocenter/interrupts/Makefile.in
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16740,16 +15383,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16758,7 +15392,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16770,17 +15404,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kinfocenter/interrupts/Makefile.in
-+++ doc/kinfocenter/interrupts/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+--- doc/kinfocenter/ioports/Makefile.in
++++ doc/kinfocenter/ioports/Makefile.in
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16790,16 +15416,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16808,7 +15425,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16820,17 +15437,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- doc/kinfocenter/ioports/Makefile.in
-+++ doc/kinfocenter/ioports/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+--- doc/kinfocenter/Makefile.in
++++ doc/kinfocenter/Makefile.in
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16840,17 +15449,17 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
- all: docs-am  all-am
+@@ -555,7 +558,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 =. 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 +566,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -16858,7 +15467,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16872,15 +15481,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/memory/Makefile.in
 +++ doc/kinfocenter/memory/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16890,16 +15491,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16908,7 +15500,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16922,15 +15514,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/nics/Makefile.in
 +++ doc/kinfocenter/nics/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16940,16 +15524,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -16958,7 +15533,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16972,15 +15547,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/opengl/Makefile.in
 +++ doc/kinfocenter/opengl/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16990,16 +15557,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17008,7 +15566,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17022,15 +15580,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/partitions/Makefile.in
 +++ doc/kinfocenter/partitions/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17040,16 +15590,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17058,7 +15599,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17072,15 +15613,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/pci/Makefile.in
 +++ doc/kinfocenter/pci/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17090,16 +15623,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17108,7 +15632,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17122,15 +15646,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/pcmcia/Makefile.in
 +++ doc/kinfocenter/pcmcia/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17140,16 +15656,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17158,7 +15665,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17172,15 +15679,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/processor/Makefile.in
 +++ doc/kinfocenter/processor/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17190,16 +15689,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17208,7 +15698,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17222,15 +15712,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/protocols/Makefile.in
 +++ doc/kinfocenter/protocols/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17240,16 +15722,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17258,7 +15731,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17272,15 +15745,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/samba/Makefile.in
 +++ doc/kinfocenter/samba/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17290,16 +15755,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17308,7 +15764,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17322,15 +15778,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/scsi/Makefile.in
 +++ doc/kinfocenter/scsi/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17340,16 +15788,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17358,7 +15797,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17372,15 +15811,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/sound/Makefile.in
 +++ doc/kinfocenter/sound/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17390,16 +15821,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17408,7 +15830,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17422,15 +15844,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/usb/Makefile.in
 +++ doc/kinfocenter/usb/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17440,16 +15854,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17458,7 +15863,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17472,15 +15877,7 @@
  mostlyclean-libtool:
 --- doc/kinfocenter/xserver/Makefile.in
 +++ doc/kinfocenter/xserver/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17490,16 +15887,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17508,7 +15896,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17522,15 +15910,7 @@
  mostlyclean-libtool:
 --- doc/kioslave/Makefile.in
 +++ doc/kioslave/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17540,16 +15920,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17558,7 +15929,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17570,7 +15941,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,10 +732,10 @@
+@@ -729,10 +732,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -17583,7 +15954,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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kioslave
@@ -17609,15 +15980,7 @@
  
 --- doc/klipper/Makefile.in
 +++ doc/klipper/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17627,16 +15990,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17645,7 +15999,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17659,15 +16013,7 @@
  mostlyclean-libtool:
 --- doc/kmenuedit/Makefile.in
 +++ doc/kmenuedit/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17677,16 +16023,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17695,7 +16032,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17707,7 +16044,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +735,7 @@
+@@ -732,7 +735,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
@@ -17716,7 +16053,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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmenuedit
@@ -17742,15 +16079,7 @@
  
 --- doc/knetattach/Makefile.in
 +++ doc/knetattach/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17760,16 +16089,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17778,7 +16098,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17792,15 +16112,7 @@
  mostlyclean-libtool:
 --- doc/kompmgr/Makefile.in
 +++ doc/kompmgr/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17810,16 +16122,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17828,7 +16131,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17842,15 +16145,7 @@
  mostlyclean-libtool:
 --- doc/konqueror/Makefile.in
 +++ doc/konqueror/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17860,16 +16155,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -542,7 +548,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17878,7 +16164,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +586,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17890,7 +16176,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -727,10 +733,10 @@
+@@ -730,10 +733,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -17903,7 +16189,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
-@@ -757,20 +763,20 @@
+@@ -760,20 +763,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konqueror
@@ -17929,15 +16215,7 @@
  
 --- doc/konsole/Makefile.in
 +++ doc/konsole/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17947,16 +16225,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -17965,7 +16234,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17977,7 +16246,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -729,7 +735,7 @@
+@@ -732,7 +735,7 @@
  KDE_DIST=index.docbook Makefile.in tabbar.png konsole.png Makefile.am index.cache.bz2 
  
  #>+ 24
@@ -17986,7 +16255,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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/konsole
@@ -18012,15 +16281,7 @@
  
 --- doc/kpager/Makefile.in
 +++ doc/kpager/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18030,16 +16291,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18048,7 +16300,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18062,15 +16314,7 @@
  mostlyclean-libtool:
 --- doc/ksplashml/Makefile.in
 +++ doc/ksplashml/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18080,16 +16324,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18098,7 +16333,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18112,15 +16347,7 @@
  mostlyclean-libtool:
 --- doc/ksysguard/Makefile.in
 +++ doc/ksysguard/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18130,16 +16357,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18148,7 +16366,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18162,15 +16380,7 @@
  mostlyclean-libtool:
 --- doc/kwrite/Makefile.in
 +++ doc/kwrite/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18180,16 +16390,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18198,7 +16399,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18212,15 +16413,7 @@
  mostlyclean-libtool:
 --- doc/kxkb/Makefile.in
 +++ doc/kxkb/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18230,16 +16423,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18248,7 +16432,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18260,17 +16444,49 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- doc/Makefile.in
++++ doc/Makefile.in
+@@ -267,6 +267,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -557,13 +560,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 =. 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
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -601,9 +604,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- doc/quickstart/Makefile.in
 +++ doc/quickstart/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18280,16 +16496,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18298,7 +16505,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18312,15 +16519,7 @@
  mostlyclean-libtool:
 --- doc/userguide/Makefile.in
 +++ doc/userguide/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18330,16 +16529,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18348,7 +16538,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18360,54 +16550,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,10 +732,10 @@
+@@ -729,10 +732,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 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 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 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 usenet.docbook kde-for-admins.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 
+-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 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-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png 
-+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 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 
+-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) 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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,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-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; 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 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 \
+-	@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 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-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; 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 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 \
+-	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 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
  
  
  #>+ 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-identity.png kmouth2.png kcalc-systray.png kmouth3.png kcontrol.png ; 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 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 \
+-	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 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
  
 --- doc/visualdict/Makefile.in
 +++ doc/visualdict/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18417,16 +16599,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18435,7 +16608,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18447,7 +16620,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -726,10 +732,10 @@
+@@ -729,10 +732,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -18460,7 +16633,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
-@@ -756,20 +762,20 @@
+@@ -759,20 +762,20 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/visualdict
@@ -18484,17 +16657,9 @@
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
---- drkonqi/Makefile.in
-+++ drkonqi/Makefile.in
-@@ -212,6 +212,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -314,6 +315,9 @@
+--- drkonqi/debuggers/Makefile.in
++++ drkonqi/debuggers/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18504,25 +16669,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -464,6 +468,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -620,7 +626,7 @@
+@@ -554,7 +557,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +664,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18532,19 +16688,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
---- drkonqi/debuggers/Makefile.in
-+++ drkonqi/debuggers/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+ 
+ mostlyclean-libtool:
+--- drkonqi/Makefile.in
++++ drkonqi/Makefile.in
+@@ -315,6 +315,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18554,25 +16702,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
- all: docs-am  all-am
+@@ -623,7 +626,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -661,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18582,19 +16721,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
 --- drkonqi/pics/Makefile.in
 +++ drkonqi/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18604,16 +16735,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18622,7 +16744,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18636,15 +16758,7 @@
  mostlyclean-libtool:
 --- drkonqi/presets/Makefile.in
 +++ drkonqi/presets/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18654,16 +16768,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18672,7 +16777,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18684,103 +16789,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kappfinder/Makefile.in
-+++ kappfinder/Makefile.in
-@@ -221,6 +221,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -323,6 +324,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -473,6 +477,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -624,7 +630,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -662,9 +668,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
-@@ -1092,26 +1098,26 @@
- 
- #>+ 22
- install-kde-icons:
-+	$(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/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
- 
- uninstall-kde-icons:
-+	-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/48x48/apps/kappfinder.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
- 
- #>+ 15
- force-reedit:
 --- kappfinder/apps/Development/Makefile.in
 +++ kappfinder/apps/Development/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18790,16 +16801,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -554,7 +560,7 @@
+@@ -557,7 +560,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18808,7 +16810,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +598,9 @@
+@@ -595,9 +598,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18822,15 +16824,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Arcade/Makefile.in
 +++ kappfinder/apps/Games/Arcade/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18840,16 +16834,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18858,7 +16843,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18872,15 +16857,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Board/Makefile.in
 +++ kappfinder/apps/Games/Board/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18890,16 +16867,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18908,7 +16876,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18922,15 +16890,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Card/Makefile.in
 +++ kappfinder/apps/Games/Card/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18940,16 +16900,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -18958,7 +16909,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18972,15 +16923,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Emulators/Makefile.in
 +++ kappfinder/apps/Games/Emulators/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18990,16 +16933,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19008,7 +16942,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19022,15 +16956,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Makefile.in
 +++ kappfinder/apps/Games/Makefile.in
-@@ -174,6 +174,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -276,6 +277,9 @@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19040,16 +16966,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,6 +430,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -571,7 +577,7 @@
+@@ -574,7 +577,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19058,7 +16975,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +615,9 @@
+@@ -612,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19072,15 +16989,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Roguelikes/Makefile.in
 +++ kappfinder/apps/Games/Roguelikes/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19090,16 +16999,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -554,7 +560,7 @@
+@@ -557,7 +560,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19108,7 +17008,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +598,9 @@
+@@ -595,9 +598,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19122,15 +17022,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/TacticStrategy/Makefile.in
 +++ kappfinder/apps/Games/TacticStrategy/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19140,16 +17032,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19158,7 +17041,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19172,15 +17055,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Games/Toys/Makefile.in
 +++ kappfinder/apps/Games/Toys/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19190,16 +17065,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19208,7 +17074,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19222,15 +17088,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Graphics/Makefile.in
 +++ kappfinder/apps/Graphics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19240,16 +17098,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -558,7 +564,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19258,7 +17107,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +602,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19272,15 +17121,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Internet/Makefile.in
 +++ kappfinder/apps/Internet/Makefile.in
-@@ -174,6 +174,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -276,6 +277,9 @@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19290,16 +17131,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,6 +430,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -581,7 +587,7 @@
+@@ -584,7 +587,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19308,7 +17140,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +625,9 @@
+@@ -622,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19320,7 +17152,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -930,7 +936,7 @@
+@@ -933,7 +936,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -19331,15 +17163,7 @@
  docs-am:
 --- kappfinder/apps/Internet/Terminal/Makefile.in
 +++ kappfinder/apps/Internet/Terminal/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19349,16 +17173,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19367,7 +17182,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19381,15 +17196,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Makefile.in
 +++ kappfinder/apps/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19399,16 +17206,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -558,7 +564,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19417,7 +17215,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +602,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19431,15 +17229,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Multimedia/Makefile.in
 +++ kappfinder/apps/Multimedia/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19449,16 +17239,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -578,7 +584,7 @@
+@@ -581,7 +584,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19467,7 +17248,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +622,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19479,7 +17260,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -780,7 +786,7 @@
+@@ -783,7 +786,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -19490,15 +17271,7 @@
  docs-am:
 --- kappfinder/apps/Office/Makefile.in
 +++ kappfinder/apps/Office/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19508,16 +17281,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -559,7 +565,7 @@
+@@ -562,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19526,7 +17290,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +603,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19538,7 +17302,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -759,7 +765,7 @@
+@@ -762,7 +765,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -19549,15 +17313,7 @@
  docs-am:
 --- kappfinder/apps/System/Makefile.in
 +++ kappfinder/apps/System/Makefile.in
-@@ -174,6 +174,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -276,6 +277,9 @@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19567,16 +17323,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,6 +430,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -571,7 +577,7 @@
+@@ -574,7 +577,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19585,7 +17332,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +615,9 @@
+@@ -612,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19599,15 +17346,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/System/Terminal/Makefile.in
 +++ kappfinder/apps/System/Terminal/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19617,16 +17356,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19635,7 +17365,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19649,15 +17379,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Utilities/Editors/Makefile.in
 +++ kappfinder/apps/Utilities/Editors/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19667,16 +17389,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19685,7 +17398,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19699,15 +17412,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Utilities/Makefile.in
 +++ kappfinder/apps/Utilities/Makefile.in
-@@ -174,6 +174,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -276,6 +277,9 @@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19717,16 +17422,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,6 +430,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -571,7 +577,7 @@
+@@ -574,7 +577,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -19735,7 +17431,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +615,9 @@
+@@ -612,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19749,15 +17445,7 @@
  mostlyclean-libtool:
 --- kappfinder/apps/Utilities/xutils/Makefile.in
 +++ kappfinder/apps/Utilities/xutils/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19767,16 +17455,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19785,7 +17464,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19797,17 +17476,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kate/Makefile.in
-+++ kate/Makefile.in
-@@ -166,6 +166,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -268,6 +269,9 @@
+--- kappfinder/Makefile.in
++++ kappfinder/Makefile.in
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19817,25 +17488,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -418,6 +422,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -559,7 +565,7 @@
- all: docs-am  all-recursive
+@@ -627,7 +630,7 @@
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +603,9 @@
+@@ -665,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19845,19 +17507,47 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+@@ -1095,26 +1098,26 @@
  
- mostlyclean-libtool:
+ #>+ 22
+ install-kde-icons:
++	$(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/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
+ 
+ uninstall-kde-icons:
++	-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/48x48/apps/kappfinder.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kappfinder.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kappfinder.png
+ 
+ #>+ 15
+ force-reedit:
 --- kate/app/Makefile.in
 +++ kate/app/Makefile.in
-@@ -245,6 +245,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -347,6 +348,9 @@
+@@ -348,6 +348,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19867,16 +17557,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,6 +501,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -677,7 +683,7 @@
+@@ -680,7 +683,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19885,7 +17566,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -715,9 +721,9 @@
+@@ -718,9 +721,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19899,15 +17580,7 @@
  	@$(NORMAL_INSTALL)
 --- kate/data/Makefile.in
 +++ kate/data/Makefile.in
-@@ -169,6 +169,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -271,6 +272,9 @@
+@@ -272,6 +272,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19917,16 +17590,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -421,6 +425,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -572,7 +578,7 @@
+@@ -575,7 +578,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -19935,7 +17599,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +616,9 @@
+@@ -613,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19949,15 +17613,7 @@
  mostlyclean-libtool:
 --- kate/interfaces/Makefile.in
 +++ kate/interfaces/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -19967,16 +17623,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -19985,7 +17632,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -19997,7 +17644,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -899,6 +905,13 @@
+@@ -902,6 +905,13 @@
  .NOEXPORT:
  
  #>+ 3
@@ -20011,7 +17658,7 @@
  documentmanager.moc: $(srcdir)/documentmanager.h
  	$(MOC) $(srcdir)/documentmanager.h -o documentmanager.moc
  
-@@ -906,39 +919,39 @@
+@@ -909,39 +919,39 @@
  mocs: documentmanager.moc
  
  #>+ 3
@@ -20066,7 +17713,7 @@
  
  #>+ 3
  viewmanager.moc: $(srcdir)/viewmanager.h
-@@ -948,15 +961,8 @@
+@@ -951,15 +961,8 @@
  mocs: viewmanager.moc
  
  #>+ 3
@@ -20083,7 +17730,7 @@
  
  #>+ 2
  KDE_DIST=Makefile.in Makefile.am 
-@@ -1003,7 +1009,7 @@
+@@ -1006,7 +1009,7 @@
  
  
  #>+ 11
@@ -20092,7 +17739,7 @@
  	@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; \
-@@ -1041,15 +1047,15 @@
+@@ -1044,15 +1047,15 @@
  #>+ 19
  documentmanager.o: documentmanager.moc 
  toolviewmanager.o: toolviewmanager.moc 
@@ -20110,17 +17757,9 @@
  nmcheck: 
  plugin.lo: plugin.moc 
  plugin.o: plugin.moc 
---- kate/pics/Makefile.in
-+++ kate/pics/Makefile.in
-@@ -174,6 +174,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -276,6 +277,9 @@
+--- kate/Makefile.in
++++ kate/Makefile.in
+@@ -269,6 +269,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20130,25 +17769,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,6 +430,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -569,7 +575,7 @@
+@@ -562,7 +565,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +613,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20160,86 +17790,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -928,43 +934,43 @@
- 
- #>+ 39
- install-kde-icons:
--	$(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
- 	$(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
--	$(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)/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
-+	$(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)/hi32-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
- 
- uninstall-kde-icons:
--	-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
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
--	-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/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/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/32x32/apps/kwrite.png
- 
- #>+ 15
- force-reedit:
 --- kate/pics/actions/Makefile.in
 +++ kate/pics/actions/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20249,16 +17802,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20267,7 +17811,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20279,7 +17823,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -724,51 +730,51 @@
+@@ -727,51 +730,51 @@
  .NOEXPORT:
  
  #>+ 2
@@ -20357,17 +17901,9 @@
  
  #>+ 15
  force-reedit:
---- kate/utils/Makefile.in
-+++ kate/utils/Makefile.in
-@@ -198,6 +198,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -300,6 +301,9 @@
+--- kate/pics/Makefile.in
++++ kate/pics/Makefile.in
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20377,25 +17913,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,6 +454,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -572,7 +575,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20405,19 +17932,80 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- kcheckpass/Makefile.in
-+++ kcheckpass/Makefile.in
-@@ -184,6 +184,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -286,6 +287,9 @@
+ 
+ mostlyclean-libtool:
+@@ -931,43 +934,43 @@
+ 
+ #>+ 39
+ install-kde-icons:
+-	$(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
+ 	$(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
+-	$(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)/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
++	$(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)/hi32-app-kwrite.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwrite.png
+ 
+ uninstall-kde-icons:
+-	-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
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kate.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kate.png
+-	-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/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/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/32x32/apps/kwrite.png
+ 
+ #>+ 15
+ force-reedit:
+--- kate/utils/Makefile.in
++++ kate/utils/Makefile.in
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20427,25 +18015,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -436,6 +440,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -586,7 +592,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +630,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20455,19 +18034,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcminit/Makefile.in
-+++ kcminit/Makefile.in
-@@ -223,6 +223,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -325,6 +326,9 @@
+--- kcheckpass/Makefile.in
++++ kcheckpass/Makefile.in
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20477,25 +18048,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -475,6 +479,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -626,7 +632,7 @@
+@@ -589,7 +592,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .c .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -664,9 +670,9 @@
+@@ -627,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20505,19 +18067,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kcontrol/Makefile.in
-+++ kcontrol/Makefile.in
-@@ -170,6 +170,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -272,6 +273,9 @@
+--- kcminit/Makefile.in
++++ kcminit/Makefile.in
+@@ -326,6 +326,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20527,25 +18081,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -422,6 +426,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -580,7 +586,7 @@
- all: docs-am  all-recursive
+@@ -629,7 +632,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +624,9 @@
+@@ -667,9 +670,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20555,19 +18100,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- kcontrol/access/Makefile.in
 +++ kcontrol/access/Makefile.in
-@@ -221,6 +221,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -323,6 +324,9 @@
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20577,16 +18114,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,6 +477,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -636,7 +642,7 @@
+@@ -639,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20595,7 +18123,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -674,9 +680,9 @@
+@@ -677,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20609,15 +18137,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/accessibility/Makefile.in
 +++ kcontrol/accessibility/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20627,16 +18147,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20645,7 +18156,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20659,15 +18170,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/arts/Makefile.in
 +++ kcontrol/arts/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20677,16 +18180,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -597,7 +603,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20695,7 +18189,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +641,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20709,15 +18203,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/background/Makefile.in
 +++ kcontrol/background/Makefile.in
-@@ -229,6 +229,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -331,6 +332,9 @@
+@@ -332,6 +332,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20727,16 +18213,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -481,6 +485,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -643,7 +649,7 @@
+@@ -646,7 +649,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20745,7 +18222,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -681,9 +687,9 @@
+@@ -684,9 +687,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20757,7 +18234,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1100,18 +1106,18 @@
+@@ -1103,18 +1106,18 @@
  
  
  #>+ 3
@@ -20782,7 +18259,7 @@
  
  #>+ 3
  bgadvanced.moc: $(srcdir)/bgadvanced.h
-@@ -1143,7 +1149,7 @@
+@@ -1146,7 +1149,7 @@
  
  #>+ 3
  clean-metasources:
@@ -20791,7 +18268,7 @@
  
  #>+ 2
  KDE_DIST=background.desktop bgwallpaper_ui.ui bghash.h bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am 
-@@ -1262,8 +1268,8 @@
+@@ -1265,8 +1268,8 @@
  $(srcdir)/bgmonitor.cpp: bgdialog_ui.h bgwallpaper_ui.h bgadvanced_ui.h 
  bgdialog.lo: bgdialog.moc 
  nmcheck: 
@@ -20803,15 +18280,7 @@
  
 --- kcontrol/background/pics/Makefile.in
 +++ kcontrol/background/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20821,16 +18290,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -20839,7 +18299,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20853,15 +18313,7 @@
  mostlyclean-libtool:
 --- kcontrol/bell/Makefile.in
 +++ kcontrol/bell/Makefile.in
-@@ -190,6 +190,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -292,6 +293,9 @@
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20871,16 +18323,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,6 +446,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -591,7 +597,7 @@
+@@ -594,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20889,7 +18332,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +635,9 @@
+@@ -632,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20903,15 +18346,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/clock/Makefile.in
 +++ kcontrol/clock/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -20921,16 +18356,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -595,7 +601,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -20939,7 +18365,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +639,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -20951,7 +18377,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -926,18 +932,18 @@
+@@ -929,18 +932,18 @@
  
  
  #>+ 3
@@ -20976,7 +18402,7 @@
  
  #>+ 3
  main.moc: $(srcdir)/main.h
-@@ -948,7 +954,7 @@
+@@ -951,7 +954,7 @@
  
  #>+ 3
  clean-metasources:
@@ -20985,7 +18411,7 @@
  
  #>+ 2
  KDE_DIST=clock.desktop dtime.h main.h Makefile.in tzone.h Makefile.am 
-@@ -999,7 +1005,7 @@
+@@ -1002,7 +1005,7 @@
  
  
  #>+ 11
@@ -20994,7 +18420,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; \
-@@ -1041,5 +1047,5 @@
+@@ -1044,5 +1047,5 @@
  nmcheck-am: nmcheck
  dtime.lo: dtime.moc 
  main.o: main.moc 
@@ -21003,15 +18429,7 @@
 +dtime.o: dtime.moc 
 --- kcontrol/colors/Makefile.in
 +++ kcontrol/colors/Makefile.in
-@@ -198,6 +198,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -300,6 +301,9 @@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21021,16 +18439,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,6 +454,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -600,7 +606,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21039,7 +18448,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +644,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21051,17 +18460,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcontrol/componentchooser/Makefile.in
-+++ kcontrol/componentchooser/Makefile.in
-@@ -211,6 +211,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -313,6 +314,9 @@
+--- kcontrol/componentchooser/componentservices/Makefile.in
++++ kcontrol/componentchooser/componentservices/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21071,25 +18472,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,6 +467,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -615,7 +621,7 @@
+@@ -554,7 +557,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -653,9 +659,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21099,28 +18491,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -1067,7 +1073,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/componentchooser/componentservices/Makefile.in
-+++ kcontrol/componentchooser/componentservices/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+ mostlyclean-libtool:
+--- kcontrol/componentchooser/Makefile.in
++++ kcontrol/componentchooser/Makefile.in
+@@ -314,6 +314,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21130,25 +18505,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
- all: docs-am  all-am
+@@ -618,7 +621,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -656,9 +659,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21158,19 +18524,20 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -1070,7 +1073,7 @@
+ 	-rm -f  componentchooser.moc kcm_componentchooser.moc
  
- mostlyclean-libtool:
+ #>+ 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
-@@ -198,6 +198,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -300,6 +301,9 @@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21180,16 +18547,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,6 +454,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -600,7 +606,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21198,7 +18556,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +644,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21210,7 +18568,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -932,18 +938,18 @@
+@@ -935,18 +938,18 @@
  
  
  #>+ 3
@@ -21235,7 +18593,7 @@
  
  #>+ 3
  certexport.moc: $(srcdir)/certexport.h
-@@ -954,7 +960,7 @@
+@@ -957,7 +960,7 @@
  
  #>+ 3
  clean-metasources:
@@ -21244,7 +18602,7 @@
  
  #>+ 2
  KDE_DIST=certgen.ui crypto.desktop configure.in.in Makefile.in Makefile.am 
-@@ -1005,7 +1011,7 @@
+@@ -1008,7 +1011,7 @@
  
  
  #>+ 11
@@ -21255,15 +18613,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_crypto_la.all_cpp.final; \
 --- kcontrol/css/Makefile.in
 +++ kcontrol/css/Makefile.in
-@@ -195,6 +195,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -297,6 +298,9 @@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21273,16 +18623,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,6 +451,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -600,7 +606,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21291,7 +18632,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +644,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21305,15 +18646,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/display/Makefile.in
 +++ kcontrol/display/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21323,16 +18656,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21341,7 +18665,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21355,15 +18679,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/dnssd/Makefile.in
 +++ kcontrol/dnssd/Makefile.in
-@@ -203,6 +203,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -305,6 +306,9 @@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21373,16 +18689,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -455,6 +459,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -606,7 +612,7 @@
+@@ -609,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21391,7 +18698,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +650,9 @@
+@@ -647,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21405,15 +18712,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/ebrowsing/Makefile.in
 +++ kcontrol/ebrowsing/Makefile.in
-@@ -208,6 +208,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -310,6 +311,9 @@
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21423,16 +18722,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,6 +464,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -610,7 +616,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21441,7 +18731,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +654,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21453,26 +18743,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1033,7 +1039,7 @@
- 
- messages: rc.cpp
- 	$(EXTRACTRC) plugins/*/*.ui >> rc.cpp
--	$(XGETTEXT) plugins/ikws/searchproviders.i18n *.cpp plugins/ikws/*.cpp plugins/shorturi/*.cpp -o $(podir)/kcmkurifilt.pot
-+	$(XGETTEXT) *.cpp plugins/ikws/*.cpp plugins/shorturi/*.cpp -o $(podir)/kcmkurifilt.pot
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- kcontrol/ebrowsing/plugins/Makefile.in
-+++ kcontrol/ebrowsing/plugins/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+--- kcontrol/ebrowsing/plugins/ikws/Makefile.in
++++ kcontrol/ebrowsing/plugins/ikws/Makefile.in
+@@ -332,6 +332,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21482,25 +18755,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
- all: docs-am  all-recursive
+@@ -652,7 +655,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
+@@ -690,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21510,19 +18774,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kcontrol/ebrowsing/plugins/ikws/Makefile.in
-+++ kcontrol/ebrowsing/plugins/ikws/Makefile.in
-@@ -229,6 +229,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -331,6 +332,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21532,25 +18788,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -481,6 +485,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -649,7 +655,7 @@
+@@ -644,7 +647,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -687,9 +693,9 @@
+@@ -682,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21560,28 +18807,20 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -1181,7 +1187,7 @@
- 	-rm -f  kurisearchfilter.moc searchproviderdlg.moc kuriikwsfilter.moc ikwsopts.moc
  
+ mostlyclean-libtool:
+@@ -844,7 +847,7 @@
+ .NOEXPORT:
+ 
  #>+ 2
--KDE_DIST=ikwsopts.h kuriikwsfiltereng.h searchprovider.h kurisearchfilter.desktop searchproviderdlg_ui.ui ikwsopts_ui.ui kuriikwsfilter.upd searchproviders.i18n kuriikwsfilter.desktop searchprovider.desktop searchproviderdlg.h kurisearchfilter.h Makefile.in Makefile.am kuriikwsfilter.h 
-+KDE_DIST=ikwsopts.h kuriikwsfiltereng.h searchprovider.h kurisearchfilter.desktop searchproviderdlg_ui.ui ikwsopts_ui.ui kuriikwsfilter.upd kuriikwsfilter.desktop searchprovider.desktop searchproviderdlg.h kurisearchfilter.h Makefile.in Makefile.am kuriikwsfilter.h 
+-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=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 
  
- #>+ 5
- clean-idl:
---- kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
-+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+ #>+ 2
+ docs-am:
+--- kcontrol/ebrowsing/plugins/localdomain/Makefile.in
++++ kcontrol/ebrowsing/plugins/localdomain/Makefile.in
+@@ -320,6 +320,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21591,25 +18830,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -641,7 +647,7 @@
- all: docs-am  all-am
+@@ -625,7 +628,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .c .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -679,9 +685,9 @@
+@@ -663,9 +666,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21619,28 +18849,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -841,7 +847,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=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:
---- kcontrol/ebrowsing/plugins/localdomain/Makefile.in
-+++ kcontrol/ebrowsing/plugins/localdomain/Makefile.in
-@@ -217,6 +217,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -319,6 +320,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kcontrol/ebrowsing/plugins/Makefile.in
++++ kcontrol/ebrowsing/plugins/Makefile.in
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21650,25 +18863,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -469,6 +473,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -622,7 +628,7 @@
+@@ -559,7 +562,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .c .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +666,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21678,19 +18882,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
+ 
+ mostlyclean-libtool:
 --- kcontrol/ebrowsing/plugins/shorturi/Makefile.in
 +++ kcontrol/ebrowsing/plugins/shorturi/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21700,16 +18896,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21718,7 +18905,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21732,15 +18919,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/energy/Makefile.in
 +++ kcontrol/energy/Makefile.in
-@@ -209,6 +209,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -311,6 +312,9 @@
+@@ -312,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21750,16 +18929,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,6 +465,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -613,7 +619,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21768,7 +18938,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +657,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21782,15 +18952,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/energy/pics/Makefile.in
 +++ kcontrol/energy/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21800,16 +18962,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -21818,7 +18971,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21832,15 +18985,7 @@
  mostlyclean-libtool:
 --- kcontrol/filetypes/Makefile.in
 +++ kcontrol/filetypes/Makefile.in
-@@ -217,6 +217,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -319,6 +320,9 @@
+@@ -320,6 +320,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21850,16 +18995,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -469,6 +473,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -630,7 +636,7 @@
+@@ -633,7 +636,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21868,7 +19004,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +674,9 @@
+@@ -671,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21882,15 +19018,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/fonts/Makefile.in
 +++ kcontrol/fonts/Makefile.in
-@@ -201,6 +201,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -303,6 +304,9 @@
+@@ -304,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21900,16 +19028,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -453,6 +457,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -607,7 +613,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21918,7 +19037,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +651,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21932,15 +19051,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/icons/Makefile.in
 +++ kcontrol/icons/Makefile.in
-@@ -203,6 +203,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -305,6 +306,9 @@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -21950,16 +19061,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -455,6 +459,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -608,7 +614,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -21968,7 +19070,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +652,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -21980,7 +19082,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -958,18 +964,18 @@
+@@ -961,18 +964,18 @@
  
  
  #>+ 3
@@ -22005,7 +19107,7 @@
  
  #>+ 3
  main.moc: $(srcdir)/main.h
-@@ -980,7 +986,7 @@
+@@ -983,7 +986,7 @@
  
  #>+ 3
  clean-metasources:
@@ -22014,7 +19116,7 @@
  
  #>+ 2
  KDE_DIST=icons.desktop Makefile.in uninstall.desktop Makefile.am 
-@@ -1031,7 +1037,7 @@
+@@ -1034,7 +1037,7 @@
  
  
  #>+ 11
@@ -22025,15 +19127,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
 --- kcontrol/info/Makefile.in
 +++ kcontrol/info/Makefile.in
-@@ -198,6 +198,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -300,6 +301,9 @@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22043,16 +19137,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,6 +454,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -603,7 +609,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22061,7 +19146,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +647,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22073,7 +19158,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -945,7 +951,7 @@
+@@ -948,7 +951,7 @@
  	-rm -f  memory.moc
  
  #>+ 2
@@ -22082,17 +19167,9 @@
  
  #>+ 3
  clean-closures:
---- kcontrol/input/Makefile.in
-+++ kcontrol/input/Makefile.in
-@@ -226,6 +226,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -328,6 +329,9 @@
+--- kcontrol/input/core/Makefile.in
++++ kcontrol/input/core/Makefile.in
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22102,16 +19179,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -478,6 +482,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -644,7 +650,7 @@
+@@ -581,7 +584,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22120,7 +19188,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -682,9 +688,9 @@
+@@ -619,9 +622,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22130,28 +19198,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -1176,7 +1182,7 @@
- 	-rm -f  logitechmouse.moc mouse.moc
  
- #>+ 2
--KDE_DIST=consoleUserPerms mouse.desktop configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz mouse_cursor_theme.upd kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am 
-+KDE_DIST=mouse.desktop consoleUserPerms configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz mouse_cursor_theme.upd kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am 
- 
- #>+ 5
- clean-ui:
---- kcontrol/input/core/Makefile.in
-+++ kcontrol/input/core/Makefile.in
-@@ -181,6 +181,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -283,6 +284,9 @@
+ clean-noinstLTLIBRARIES:
+--- kcontrol/input/Makefile.in
++++ kcontrol/input/Makefile.in
+@@ -329,6 +329,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22161,16 +19212,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,6 +437,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -578,7 +584,7 @@
+@@ -647,7 +650,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22179,7 +19221,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -616,9 +622,9 @@
+@@ -685,9 +688,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22189,19 +19231,20 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -1179,7 +1182,7 @@
+ 	-rm -f  logitechmouse.moc mouse.moc
  
- clean-noinstLTLIBRARIES:
+ #>+ 2
+-KDE_DIST=consoleUserPerms mouse.desktop configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz mouse_cursor_theme.upd kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am 
++KDE_DIST=mouse.desktop consoleUserPerms configure.in.bot mouse.h logitechmouse.h cursor_large.bdf logitechmouse.usermap cursor_small_white.pcf.gz mouse_cursor_theme.upd kmousedlg.ui logitechmouse_base.ui configure.in.in cursor_large_white.pcf.gz Makefile.in cursor_large_black.pcf.gz Makefile.am 
+ 
+ #>+ 5
+ clean-ui:
 --- kcontrol/input/pics/Makefile.in
 +++ kcontrol/input/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22211,16 +19254,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -22229,7 +19263,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22243,15 +19277,7 @@
  mostlyclean-libtool:
 --- kcontrol/input/xcursor/Makefile.in
 +++ kcontrol/input/xcursor/Makefile.in
-@@ -184,6 +184,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -286,6 +287,9 @@
+@@ -287,6 +287,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22261,16 +19287,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -436,6 +440,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -581,7 +587,7 @@
+@@ -584,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22279,7 +19296,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +625,9 @@
+@@ -622,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22293,15 +19310,7 @@
  clean-noinstLTLIBRARIES:
 --- kcontrol/ioslaveinfo/Makefile.in
 +++ kcontrol/ioslaveinfo/Makefile.in
-@@ -191,6 +191,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -293,6 +294,9 @@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22311,16 +19320,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,6 +447,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -592,7 +598,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22329,7 +19329,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +636,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22343,15 +19343,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/joystick/Makefile.in
 +++ kcontrol/joystick/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22361,16 +19353,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -603,7 +609,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22379,7 +19362,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +647,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22391,17 +19374,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kcontrol/kcontrol/about/Makefile.in
++++ kcontrol/kcontrol/about/Makefile.in
+@@ -261,6 +261,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -558,7 +561,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -596,9 +599,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- kcontrol/kcontrol/Makefile.in
 +++ kcontrol/kcontrol/Makefile.in
-@@ -247,6 +247,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -349,6 +350,9 @@
+@@ -350,6 +350,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22411,16 +19419,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,6 +503,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -669,7 +675,7 @@
+@@ -672,7 +675,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22429,7 +19428,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -707,9 +713,9 @@
+@@ -710,9 +713,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22441,7 +19440,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1254,6 +1260,13 @@
+@@ -1257,6 +1260,13 @@
  mocs: indexwidget.moc
  
  #>+ 3
@@ -22455,7 +19454,7 @@
  dockcontainer.moc: $(srcdir)/dockcontainer.h
  	$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
  
-@@ -1268,13 +1281,6 @@
+@@ -1271,13 +1281,6 @@
  mocs: aboutwidget.moc
  
  #>+ 3
@@ -22469,7 +19468,7 @@
  proxywidget.moc: $(srcdir)/proxywidget.h
  	$(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
  
-@@ -1332,10 +1338,10 @@
+@@ -1335,10 +1338,10 @@
  
  #>+ 3
  clean-metasources:
@@ -22482,7 +19481,7 @@
  
  #>+ 4
  clean-idl:
-@@ -1347,23 +1353,23 @@
+@@ -1350,23 +1353,23 @@
  
  #>+ 19
  install-kde-icons:
@@ -22515,7 +19514,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1404,7 +1410,7 @@
+@@ -1407,7 +1410,7 @@
  
  
  #>+ 11
@@ -22524,67 +19523,9 @@
  	@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; \
---- kcontrol/kcontrol/about/Makefile.in
-+++ kcontrol/kcontrol/about/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
- all: docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- kcontrol/kded/Makefile.in
 +++ kcontrol/kded/Makefile.in
-@@ -191,6 +191,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -293,6 +294,9 @@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22594,16 +19535,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,6 +447,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -592,7 +598,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22612,7 +19544,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +636,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22624,7 +19556,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -932,7 +938,7 @@
+@@ -935,7 +938,7 @@
  	-rm -f  kcmkded.moc
  
  #>+ 2
@@ -22635,15 +19567,7 @@
  clean-closures:
 --- kcontrol/kdm/Makefile.in
 +++ kcontrol/kdm/Makefile.in
-@@ -202,6 +202,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -304,6 +305,9 @@
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22653,16 +19577,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -454,6 +458,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -610,7 +616,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22671,7 +19586,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +654,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22685,15 +19600,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/keys/Makefile.in
 +++ kcontrol/keys/Makefile.in
-@@ -202,6 +202,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -304,6 +305,9 @@
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22703,16 +19610,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -454,6 +458,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -608,7 +614,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22721,7 +19619,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +652,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22733,7 +19631,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1015,18 +1021,18 @@
+@@ -1018,18 +1021,18 @@
  mocs: treeview.moc
  
  #>+ 3
@@ -22758,7 +19656,7 @@
  
  #>+ 3
  keyconfig.moc: $(srcdir)/keyconfig.h
-@@ -1044,7 +1050,7 @@
+@@ -1047,7 +1050,7 @@
  
  #>+ 3
  clean-metasources:
@@ -22767,7 +19665,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 
-@@ -1095,7 +1101,7 @@
+@@ -1098,7 +1101,7 @@
  
  
  #>+ 11
@@ -22776,67 +19674,9 @@
  	@echo 'creating kcm_keys_la.all_cpp.cpp ...'; \
  	rm -f kcm_keys_la.all_cpp.files kcm_keys_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kcm_keys_la.all_cpp.final; \
---- kcontrol/kfontinst/Makefile.in
-+++ kcontrol/kfontinst/Makefile.in
-@@ -176,6 +176,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -278,6 +279,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -428,6 +432,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -573,7 +579,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -611,9 +617,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- kcontrol/kfontinst/kcmfontinst/Makefile.in
 +++ kcontrol/kfontinst/kcmfontinst/Makefile.in
-@@ -203,6 +203,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -305,6 +306,9 @@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22846,16 +19686,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -455,6 +459,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -622,7 +628,7 @@
+@@ -625,7 +628,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22864,7 +19695,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +666,9 @@
+@@ -663,9 +666,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22876,7 +19707,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -984,16 +990,16 @@
+@@ -987,16 +990,16 @@
  
  #>+ 13
  install-kde-icons:
@@ -22898,15 +19729,7 @@
  #>+ 15
 --- kcontrol/kfontinst/kfile-plugin/Makefile.in
 +++ kcontrol/kfontinst/kfile-plugin/Makefile.in
-@@ -195,6 +195,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -297,6 +298,9 @@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22916,16 +19739,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,6 +451,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -22934,7 +19748,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22948,15 +19762,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/kfontinst/Makefile.in
 +++ kcontrol/kfontinst/kfontinst/Makefile.in
-@@ -203,6 +203,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -305,6 +306,9 @@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22966,16 +19772,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -455,6 +459,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -614,7 +620,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -22984,7 +19781,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +658,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -22998,15 +19795,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/kio/Makefile.in
 +++ kcontrol/kfontinst/kio/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23016,16 +19805,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -611,7 +617,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23034,7 +19814,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +655,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23048,15 +19828,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/lib/Makefile.in
 +++ kcontrol/kfontinst/lib/Makefile.in
-@@ -195,6 +195,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -297,6 +298,9 @@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23066,16 +19838,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,6 +451,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -602,7 +608,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23084,7 +19847,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +646,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23096,17 +19859,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kcontrol/kfontinst/Makefile.in
++++ kcontrol/kfontinst/Makefile.in
+@@ -279,6 +279,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -576,7 +579,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -614,9 +617,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- kcontrol/kfontinst/thumbnail/Makefile.in
 +++ kcontrol/kfontinst/thumbnail/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23116,16 +19904,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -597,7 +603,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23134,7 +19913,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +641,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23148,15 +19927,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/kfontinst/viewpart/Makefile.in
 +++ kcontrol/kfontinst/viewpart/Makefile.in
-@@ -220,6 +220,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -322,6 +323,9 @@
+@@ -323,6 +323,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23166,16 +19937,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,6 +476,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -630,7 +636,7 @@
+@@ -633,7 +636,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23184,7 +19946,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +674,9 @@
+@@ -671,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23196,7 +19958,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1033,11 +1039,11 @@
+@@ -1036,11 +1039,11 @@
  .NOEXPORT:
  
  #>+ 3
@@ -23211,7 +19973,7 @@
  
  #>+ 3
  FontViewPartFactory.moc: $(srcdir)/FontViewPartFactory.h
-@@ -1047,11 +1053,11 @@
+@@ -1050,11 +1053,11 @@
  mocs: FontViewPartFactory.moc
  
  #>+ 3
@@ -23226,7 +19988,7 @@
  
  #>+ 3
  FontPreview.moc: $(srcdir)/FontPreview.h
-@@ -1071,7 +1077,7 @@
+@@ -1074,7 +1077,7 @@
  
  #>+ 3
  clean-metasources:
@@ -23235,7 +19997,7 @@
  
  #>+ 2
  KDE_DIST=kfontviewui.rc kfontviewpart.desktop kfontview.desktop Makefile.in Makefile.am kfontviewpart.rc 
-@@ -1122,7 +1128,7 @@
+@@ -1125,7 +1128,7 @@
  
  
  #>+ 11
@@ -23244,7 +20006,7 @@
  	@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; \
-@@ -1162,9 +1168,9 @@
+@@ -1165,9 +1168,9 @@
  FontPreview.lo: FontPreview.moc 
  FontPreview.o: FontPreview.moc 
  nmcheck-am: nmcheck
@@ -23258,15 +20020,7 @@
  FontViewerApp.o: FontViewerApp.moc 
 --- kcontrol/kicker/Makefile.in
 +++ kcontrol/kicker/Makefile.in
-@@ -207,6 +207,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -309,6 +310,9 @@
+@@ -310,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23276,16 +20030,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -459,6 +463,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -630,7 +636,7 @@
+@@ -633,7 +636,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23294,7 +20039,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +674,9 @@
+@@ -671,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23306,7 +20051,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1007,11 +1013,11 @@
+@@ -1010,11 +1013,11 @@
  
  
  #>+ 3
@@ -23321,7 +20066,7 @@
  
  #>+ 3
  menutab_impl.moc: $(srcdir)/menutab_impl.h
-@@ -1021,11 +1027,11 @@
+@@ -1024,11 +1027,11 @@
  mocs: menutab_impl.moc
  
  #>+ 3
@@ -23336,7 +20081,7 @@
  
  #>+ 3
  positionconfig.moc: $(srcdir)/positionconfig.h
-@@ -1092,10 +1098,10 @@
+@@ -1095,10 +1098,10 @@
  
  #>+ 3
  clean-metasources:
@@ -23349,7 +20094,7 @@
  
  #>+ 4
  clean-idl:
-@@ -1157,7 +1163,7 @@
+@@ -1160,7 +1163,7 @@
  
  
  #>+ 11
@@ -23358,7 +20103,7 @@
  	@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; \
-@@ -1214,8 +1220,8 @@
+@@ -1217,8 +1220,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 
@@ -23370,15 +20115,7 @@
  menutab_impl.lo: menutab_impl.moc 
 --- kcontrol/kio/Makefile.in
 +++ kcontrol/kio/Makefile.in
-@@ -223,6 +223,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -325,6 +326,9 @@
+@@ -326,6 +326,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23388,16 +20125,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -475,6 +479,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -649,7 +655,7 @@
+@@ -652,7 +655,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23406,7 +20134,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -687,9 +693,9 @@
+@@ -690,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23418,7 +20146,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1175,18 +1181,18 @@
+@@ -1178,18 +1181,18 @@
  mocs: smbrodlg.moc
  
  #>+ 3
@@ -23443,7 +20171,7 @@
  
  #>+ 3
  kproxydlg.moc: $(srcdir)/kproxydlg.h
-@@ -1260,10 +1266,10 @@
+@@ -1263,10 +1266,10 @@
  
  #>+ 3
  clean-metasources:
@@ -23456,7 +20184,7 @@
  
  #>+ 13
  clean-ui:
-@@ -1325,7 +1331,7 @@
+@@ -1328,7 +1331,7 @@
  
  
  #>+ 11
@@ -23467,15 +20195,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
 --- kcontrol/kio/uasproviders/Makefile.in
 +++ kcontrol/kio/uasproviders/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23485,16 +20205,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -561,7 +567,7 @@
+@@ -564,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23503,7 +20214,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +605,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23515,7 +20226,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -761,7 +767,7 @@
+@@ -764,7 +767,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -23526,15 +20237,7 @@
  docs-am:
 --- kcontrol/knotify/Makefile.in
 +++ kcontrol/knotify/Makefile.in
-@@ -212,6 +212,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -314,6 +315,9 @@
+@@ -315,6 +315,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23544,16 +20247,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -464,6 +468,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -619,7 +625,7 @@
+@@ -622,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23562,7 +20256,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +663,9 @@
+@@ -660,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23576,15 +20270,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/knotify/sounds/Makefile.in
 +++ kcontrol/knotify/sounds/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23594,16 +20280,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -661,7 +667,7 @@
+@@ -664,7 +667,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23612,7 +20289,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -699,9 +705,9 @@
+@@ -702,9 +705,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23626,15 +20303,7 @@
  mostlyclean-libtool:
 --- kcontrol/konq/Makefile.in
 +++ kcontrol/konq/Makefile.in
-@@ -202,6 +202,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -304,6 +305,9 @@
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23644,16 +20313,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -454,6 +458,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -619,7 +625,7 @@
+@@ -622,7 +625,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23662,7 +20322,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -657,9 +663,9 @@
+@@ -660,9 +663,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23674,7 +20334,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1053,7 +1059,7 @@
+@@ -1056,7 +1059,7 @@
  	-rm -f  previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
  
  #>+ 2
@@ -23685,15 +20345,7 @@
  clean-idl:
 --- kcontrol/konqhtml/Makefile.in
 +++ kcontrol/konqhtml/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23703,16 +20355,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -614,7 +620,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23721,7 +20364,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +658,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23733,7 +20376,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -983,13 +989,6 @@
+@@ -986,13 +989,6 @@
  mocs: jspolicies.moc
  
  #>+ 3
@@ -23747,7 +20390,7 @@
  main.moc: $(srcdir)/main.h
  	$(MOC) $(srcdir)/main.h -o main.moc
  
-@@ -1004,6 +1003,13 @@
+@@ -1007,6 +1003,13 @@
  mocs: jsopts.moc
  
  #>+ 3
@@ -23761,7 +20404,7 @@
  javaopts.moc: $(srcdir)/javaopts.h
  	$(MOC) $(srcdir)/javaopts.h -o javaopts.moc
  
-@@ -1032,22 +1038,22 @@
+@@ -1035,22 +1038,22 @@
  mocs: advancedTabDialog.moc
  
  #>+ 3
@@ -23791,7 +20434,7 @@
  
  #>+ 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 
-@@ -1104,7 +1110,7 @@
+@@ -1107,7 +1110,7 @@
  
  
  #>+ 11
@@ -23802,15 +20445,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
 --- kcontrol/konsole/Makefile.in
 +++ kcontrol/konsole/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23820,16 +20455,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -607,7 +613,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -23838,7 +20464,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +651,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23850,17 +20476,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcontrol/krdb/Makefile.in
-+++ kcontrol/krdb/Makefile.in
-@@ -203,6 +203,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -305,6 +306,9 @@
+--- kcontrol/krdb/ad/Makefile.in
++++ kcontrol/krdb/ad/Makefile.in
+@@ -265,6 +265,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23870,25 +20488,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -455,6 +459,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -605,7 +611,7 @@
+@@ -564,7 +567,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +649,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23898,19 +20507,20 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+@@ -785,7 +788,7 @@
+ .NOEXPORT:
  
- clean-noinstLTLIBRARIES:
---- kcontrol/krdb/ad/Makefile.in
-+++ kcontrol/krdb/ad/Makefile.in
-@@ -162,6 +162,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -264,6 +265,9 @@
+ #>+ 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 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:
+--- kcontrol/krdb/kcs/Makefile.in
++++ kcontrol/krdb/kcs/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23920,16 +20530,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -414,6 +418,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -561,7 +567,7 @@
+@@ -562,7 +565,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -23938,7 +20539,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +605,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -23948,28 +20549,20 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
-@@ -782,7 +788,7 @@
+ 
+ mostlyclean-libtool:
+@@ -764,7 +767,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 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 
+-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 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:
---- kcontrol/krdb/kcs/Makefile.in
-+++ kcontrol/krdb/kcs/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- kcontrol/krdb/Makefile.in
++++ kcontrol/krdb/Makefile.in
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23979,25 +20572,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -559,7 +565,7 @@
- all: docs-am  all-am
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -597,9 +603,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24008,27 +20592,10 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
-@@ -761,7 +767,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 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:
+ clean-noinstLTLIBRARIES:
 --- kcontrol/krdb/pics/Makefile.in
 +++ kcontrol/krdb/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24038,16 +20605,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24056,7 +20614,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24070,15 +20628,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastDark/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastDark/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24088,16 +20638,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24106,7 +20647,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24120,15 +20661,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24138,16 +20671,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24156,7 +20680,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24170,15 +20694,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastLight/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastLight/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24188,16 +20704,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24206,7 +20713,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24220,15 +20727,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
 +++ kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24238,16 +20737,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24256,7 +20746,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24270,15 +20760,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/KDE_Classic/Makefile.in
 +++ kcontrol/krdb/themes/KDE_Classic/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24288,16 +20770,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24306,7 +20779,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24320,15 +20793,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Keramik/Makefile.in
 +++ kcontrol/krdb/themes/Keramik/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24338,16 +20803,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24356,7 +20812,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24370,15 +20826,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Makefile.in
 +++ kcontrol/krdb/themes/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24388,16 +20836,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -560,7 +566,7 @@
+@@ -563,7 +566,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -24406,7 +20845,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +604,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24420,15 +20859,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Plastik/Makefile.in
 +++ kcontrol/krdb/themes/Plastik/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24438,16 +20869,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24456,7 +20878,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24470,15 +20892,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Platinum/Makefile.in
 +++ kcontrol/krdb/themes/Platinum/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24488,16 +20902,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24506,7 +20911,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24520,15 +20925,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Redmond/Makefile.in
 +++ kcontrol/krdb/themes/Redmond/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24538,16 +20935,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24556,7 +20944,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24570,15 +20958,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/Sunshine/Makefile.in
 +++ kcontrol/krdb/themes/Sunshine/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24588,16 +20968,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24606,7 +20977,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24620,15 +20991,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/YellowOnBlue/Makefile.in
 +++ kcontrol/krdb/themes/YellowOnBlue/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24638,16 +21001,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24656,7 +21010,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24670,15 +21024,7 @@
  mostlyclean-libtool:
 --- kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
 +++ kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24688,16 +21034,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24706,7 +21043,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24720,15 +21057,7 @@
  mostlyclean-libtool:
 --- kcontrol/kthememanager/Makefile.in
 +++ kcontrol/kthememanager/Makefile.in
-@@ -203,6 +203,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -305,6 +306,9 @@
+@@ -306,6 +306,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24738,16 +21067,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -455,6 +459,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -610,7 +616,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24756,7 +21076,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +654,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24770,15 +21090,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/launch/Makefile.in
 +++ kcontrol/launch/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24788,16 +21100,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -594,7 +600,7 @@
+@@ -597,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24806,7 +21109,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +638,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24818,17 +21121,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kcontrol/locale/default/Makefile.in
++++ kcontrol/locale/default/Makefile.in
+@@ -261,6 +261,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -554,7 +557,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -592,9 +595,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- kcontrol/locale/Makefile.in
 +++ kcontrol/locale/Makefile.in
-@@ -217,6 +217,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -319,6 +320,9 @@
+@@ -320,6 +320,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24838,16 +21166,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -469,6 +473,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -620,7 +626,7 @@
+@@ -623,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -24856,7 +21175,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +664,9 @@
+@@ -661,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24868,7 +21187,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1086,11 +1092,11 @@
+@@ -1089,11 +1092,11 @@
  mocs: klocalesample.moc
  
  #>+ 3
@@ -24883,7 +21202,7 @@
  
  #>+ 3
  localemon.moc: $(srcdir)/localemon.h
-@@ -1100,11 +1106,11 @@
+@@ -1103,11 +1106,11 @@
  mocs: localemon.moc
  
  #>+ 3
@@ -24898,7 +21217,7 @@
  
  #>+ 3
  kcmlocale.moc: $(srcdir)/kcmlocale.h
-@@ -1122,7 +1128,7 @@
+@@ -1125,7 +1128,7 @@
  
  #>+ 3
  clean-metasources:
@@ -24907,7 +21226,7 @@
  
  #>+ 2
  KDE_DIST=TIMEZONES language.desktop Makefile.in Makefile.am 
-@@ -1173,7 +1179,7 @@
+@@ -1176,7 +1179,7 @@
  
  
  #>+ 11
@@ -24916,17 +21235,9 @@
  	@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; \
---- kcontrol/locale/default/Makefile.in
-+++ kcontrol/locale/default/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- kcontrol/locale/pics/Makefile.in
++++ kcontrol/locale/pics/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24936,16 +21247,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -24954,7 +21256,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -24966,17 +21268,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kcontrol/locale/pics/Makefile.in
-+++ kcontrol/locale/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- kcontrol/Makefile.in
++++ kcontrol/Makefile.in
+@@ -273,6 +273,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24986,17 +21280,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
- all: docs-am  all-am
+@@ -583,7 +586,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -25004,7 +21289,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -621,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25018,15 +21303,7 @@
  mostlyclean-libtool:
 --- kcontrol/nics/Makefile.in
 +++ kcontrol/nics/Makefile.in
-@@ -191,6 +191,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -293,6 +294,9 @@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25036,16 +21313,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,6 +447,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -592,7 +598,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25054,7 +21322,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +636,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25068,15 +21336,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/performance/Makefile.in
 +++ kcontrol/performance/Makefile.in
-@@ -200,6 +200,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -302,6 +303,9 @@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25086,16 +21346,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,6 +456,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -607,7 +613,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -25104,7 +21355,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +651,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25118,15 +21369,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/pics/Makefile.in
 +++ kcontrol/pics/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25136,16 +21379,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -540,7 +546,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -25154,7 +21388,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -25166,7 +21400,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -723,581 +729,581 @@
+@@ -726,581 +729,581 @@
  .NOEXPORT:
  
  #>+ 2
@@ -26255,15 +22489,7 @@
  force-reedit:
 --- kcontrol/privacy/Makefile.in
 +++ kcontrol/privacy/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26273,16 +22499,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26291,7 +22508,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26305,15 +22522,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/randr/Makefile.in
 +++ kcontrol/randr/Makefile.in
-@@ -224,6 +224,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -326,6 +327,9 @@
+@@ -327,6 +327,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26323,16 +22532,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -476,6 +480,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -636,7 +642,7 @@
+@@ -639,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26341,7 +22541,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -674,9 +680,9 @@
+@@ -677,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26355,15 +22555,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/samba/Makefile.in
 +++ kcontrol/samba/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26373,16 +22565,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -597,7 +603,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26391,7 +22574,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +641,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26405,15 +22588,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/screensaver/Makefile.in
 +++ kcontrol/screensaver/Makefile.in
-@@ -200,6 +200,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -302,6 +303,9 @@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26423,16 +22598,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,6 +456,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -607,7 +613,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26441,7 +22607,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +651,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26455,15 +22621,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/smartcard/Makefile.in
 +++ kcontrol/smartcard/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26473,16 +22631,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26491,7 +22640,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26505,15 +22654,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/smserver/Makefile.in
 +++ kcontrol/smserver/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26523,16 +22664,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26541,7 +22673,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26555,15 +22687,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/spellchecking/Makefile.in
 +++ kcontrol/spellchecking/Makefile.in
-@@ -190,6 +190,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -292,6 +293,9 @@
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26573,16 +22697,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,6 +446,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -591,7 +597,7 @@
+@@ -594,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26591,7 +22706,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +635,9 @@
+@@ -632,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26603,17 +22718,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcontrol/style/Makefile.in
-+++ kcontrol/style/Makefile.in
-@@ -213,6 +213,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -315,6 +316,9 @@
+--- kcontrol/style/keramik/Makefile.in
++++ kcontrol/style/keramik/Makefile.in
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26623,16 +22730,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,6 +469,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -618,7 +624,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26641,7 +22739,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -656,9 +662,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26653,17 +22751,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kcontrol/style/keramik/Makefile.in
-+++ kcontrol/style/keramik/Makefile.in
-@@ -191,6 +191,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -293,6 +294,9 @@
+--- kcontrol/style/Makefile.in
++++ kcontrol/style/Makefile.in
+@@ -316,6 +316,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26673,16 +22763,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,6 +447,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -590,7 +596,7 @@
+@@ -621,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26691,7 +22772,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +634,9 @@
+@@ -659,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26705,15 +22786,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/taskbar/Makefile.in
 +++ kcontrol/taskbar/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26723,16 +22796,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26741,7 +22805,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26755,15 +22819,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/usbview/Makefile.in
 +++ kcontrol/usbview/Makefile.in
-@@ -195,6 +195,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -297,6 +298,9 @@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26773,26 +22829,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,6 +451,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -590,15 +596,15 @@
- AM_CPPFLAGS = $(all_includes) 
- #>- METASOURCES = AUTO
- xdg_apps_DATA = kcmusb.desktop
--usb_DATA = usb.ids
--usbdir = $(kde_datadir)/kcmusb
-+ at install_usbids_TRUE@usb_DATA = usb.ids
-+ at install_usbids_TRUE@usbdir = $(kde_datadir)/kcmusb
- #>- all: all-am
- #>+ 1
- all: docs-am  all-am
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26801,7 +22838,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +642,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26815,15 +22852,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/view1394/Makefile.in
 +++ kcontrol/view1394/Makefile.in
-@@ -195,6 +195,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -297,6 +298,9 @@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26833,16 +22862,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,6 +451,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -600,7 +606,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26851,7 +22871,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +644,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26865,15 +22885,7 @@
  	@$(NORMAL_INSTALL)
 --- kcontrol/xinerama/Makefile.in
 +++ kcontrol/xinerama/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26883,16 +22895,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26901,7 +22904,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26915,15 +22918,7 @@
  	@$(NORMAL_INSTALL)
 --- kdcop/Makefile.in
 +++ kdcop/Makefile.in
-@@ -205,6 +205,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -307,6 +308,9 @@
+@@ -308,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26933,16 +22928,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -457,6 +461,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -606,7 +612,7 @@
+@@ -609,7 +612,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -26951,7 +22937,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -644,9 +650,9 @@
+@@ -647,9 +650,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -26965,15 +22951,7 @@
  	@$(NORMAL_INSTALL)
 --- kdebugdialog/Makefile.in
 +++ kdebugdialog/Makefile.in
-@@ -189,6 +189,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -291,6 +292,9 @@
+@@ -292,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26983,16 +22961,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -441,6 +445,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -586,7 +592,7 @@
+@@ -589,7 +592,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27001,7 +22970,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +630,9 @@
+@@ -627,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27015,15 +22984,7 @@
  	@$(NORMAL_INSTALL)
 --- kdeeject/Makefile.in
 +++ kdeeject/Makefile.in
-@@ -152,6 +152,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -254,6 +255,9 @@
+@@ -255,6 +255,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27033,16 +22994,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -404,6 +408,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -544,7 +550,7 @@
+@@ -547,7 +550,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27051,7 +23003,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -582,9 +588,9 @@
+@@ -585,9 +588,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27063,67 +23015,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
---- kdepasswd/Makefile.in
-+++ kdepasswd/Makefile.in
-@@ -213,6 +213,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -315,6 +316,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -465,6 +469,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -613,7 +619,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -651,9 +657,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
 --- kdepasswd/kcm/Makefile.in
 +++ kdepasswd/kcm/Makefile.in
-@@ -211,6 +211,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -313,6 +314,9 @@
+@@ -314,6 +314,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27133,16 +23027,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,6 +467,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -620,7 +626,7 @@
+@@ -623,7 +626,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27151,7 +23036,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -658,9 +664,9 @@
+@@ -661,9 +664,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27165,15 +23050,7 @@
  	@$(NORMAL_INSTALL)
 --- kdepasswd/kcm/pics/Makefile.in
 +++ kdepasswd/kcm/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27183,16 +23060,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -558,7 +564,7 @@
+@@ -561,7 +564,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27201,7 +23069,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +602,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27213,7 +23081,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -757,7 +763,7 @@
+@@ -760,7 +763,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -27222,17 +23090,9 @@
  
  #>+ 2
  docs-am:
---- kdeprint/Makefile.in
-+++ kdeprint/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+--- kdepasswd/Makefile.in
++++ kdepasswd/Makefile.in
+@@ -316,6 +316,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27242,25 +23102,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
- all: docs-am  all-recursive
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27270,19 +23121,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
 --- kdeprint/descriptions/Makefile.in
 +++ kdeprint/descriptions/Makefile.in
-@@ -177,6 +177,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -279,6 +280,9 @@
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27292,16 +23135,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,6 +433,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -574,7 +580,7 @@
+@@ -577,7 +580,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27310,7 +23144,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +618,9 @@
+@@ -615,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27322,67 +23156,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  sortthem$(EXEEXT): $(sortthem_OBJECTS) $(sortthem_DEPENDENCIES) 
  	@rm -f sortthem$(EXEEXT)
---- kdeprint/kdeprint_part/Makefile.in
-+++ kdeprint/kdeprint_part/Makefile.in
-@@ -195,6 +195,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -297,6 +298,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -447,6 +451,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -605,7 +611,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -643,9 +649,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
 --- kdeprint/kdeprintfax/Makefile.in
 +++ kdeprint/kdeprintfax/Makefile.in
-@@ -206,6 +206,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -308,6 +309,9 @@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27392,16 +23168,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -458,6 +462,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -613,7 +619,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27410,7 +23177,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +657,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27422,7 +23189,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1028,38 +1034,38 @@
+@@ -1031,38 +1034,38 @@
  	-rm -f  conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
  
  #>+ 2
@@ -27474,17 +23241,42 @@
  	-rm -f $(DESTDIR)$(picdir)/crystalsvg/16x16/actions/abentry.png
  
  #>+ 15
+--- kdeprint/kdeprint_part/Makefile.in
++++ kdeprint/kdeprint_part/Makefile.in
+@@ -298,6 +298,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -608,7 +611,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -646,9 +649,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- kdeprint/kjobviewer/Makefile.in
 +++ kdeprint/kjobviewer/Makefile.in
-@@ -212,6 +212,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -314,6 +315,9 @@
+@@ -315,6 +315,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27494,16 +23286,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -464,6 +468,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -623,7 +629,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27512,7 +23295,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +667,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27524,7 +23307,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1067,29 +1073,29 @@
+@@ -1070,29 +1073,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -27568,15 +23351,7 @@
  force-reedit:
 --- kdeprint/kprinter/Makefile.in
 +++ kdeprint/kprinter/Makefile.in
-@@ -206,6 +206,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -308,6 +309,9 @@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27586,16 +23361,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -458,6 +462,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -613,7 +619,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27604,7 +23370,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +657,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27616,17 +23382,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kdeprint/Makefile.in
++++ kdeprint/Makefile.in
+@@ -267,6 +267,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -559,7 +562,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -597,9 +600,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- kdeprint/printmgr/Makefile.in
 +++ kdeprint/printmgr/Makefile.in
-@@ -193,6 +193,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -295,6 +296,9 @@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27636,16 +23427,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,6 +449,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27654,7 +23436,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27666,7 +23448,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -945,29 +951,29 @@
+@@ -948,29 +951,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -27710,15 +23492,7 @@
  force-reedit:
 --- kdeprint/slave/Makefile.in
 +++ kdeprint/slave/Makefile.in
-@@ -208,6 +208,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -310,6 +311,9 @@
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27728,16 +23502,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,6 +464,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -613,7 +619,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -27746,7 +23511,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +657,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27760,15 +23525,7 @@
  	@$(NORMAL_INSTALL)
 --- kdeprint/slave/mimetypes/Makefile.in
 +++ kdeprint/slave/mimetypes/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27778,16 +23535,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -553,7 +559,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27796,7 +23544,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +597,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27810,15 +23558,7 @@
  mostlyclean-libtool:
 --- kdeprint/slave/templates/Makefile.in
 +++ kdeprint/slave/templates/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27828,16 +23568,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -580,7 +586,7 @@
+@@ -583,7 +586,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -27846,7 +23577,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -618,9 +624,9 @@
+@@ -621,9 +624,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -27858,149 +23589,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdesktop/Makefile.in
-+++ kdesktop/Makefile.in
-@@ -265,6 +265,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -367,6 +368,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -517,6 +521,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -706,7 +712,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .c .cc .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -744,9 +750,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -1420,18 +1426,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
-@@ -1455,11 +1461,11 @@
- mocs: desktop.moc
- 
- #>+ 3
--kdiconview.moc: $(srcdir)/kdiconview.h
--	$(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
-+pixmapserver.moc: $(srcdir)/pixmapserver.h
-+	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
- 
- #>+ 2
--mocs: kdiconview.moc
-+mocs: pixmapserver.moc
- 
- #>+ 3
- kcustommenu.moc: $(srcdir)/kcustommenu.h
-@@ -1469,11 +1475,11 @@
- mocs: kcustommenu.moc
- 
- #>+ 3
--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: pixmapserver.moc
-+mocs: kdiconview.moc
- 
- #>+ 3
- xautolock.moc: $(srcdir)/xautolock.h
-@@ -1500,7 +1506,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  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 
-@@ -1569,7 +1575,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  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; \
-@@ -1581,7 +1587,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  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; \
 --- kdesktop/init/Makefile.in
 +++ kdesktop/init/Makefile.in
-@@ -176,6 +176,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -278,6 +279,9 @@
+@@ -279,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28010,16 +23601,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -428,6 +432,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -572,7 +578,7 @@
+@@ -575,7 +578,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -28028,7 +23610,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +616,9 @@
+@@ -613,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28042,15 +23624,7 @@
  mostlyclean-libtool:
 --- kdesktop/init/Templates/Makefile.in
 +++ kdesktop/init/Templates/Makefile.in
-@@ -159,6 +159,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -261,6 +262,9 @@
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28060,16 +23634,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -411,6 +415,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -568,7 +574,7 @@
+@@ -571,7 +574,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28078,7 +23643,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -606,9 +612,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28090,7 +23655,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -791,7 +797,7 @@
+@@ -794,7 +797,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -28101,15 +23666,7 @@
  docs-am:
 --- kdesktop/kwebdesktop/Makefile.in
 +++ kdesktop/kwebdesktop/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28119,16 +23676,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -599,7 +605,7 @@
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28137,7 +23685,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +643,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28151,15 +23699,7 @@
  	@$(NORMAL_INSTALL)
 --- kdesktop/lock/Makefile.in
 +++ kdesktop/lock/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28169,16 +23709,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -593,7 +599,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -28187,7 +23718,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +637,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28199,17 +23730,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kdesktop/patterns/Makefile.in
-+++ kdesktop/patterns/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- kdesktop/Makefile.in
++++ kdesktop/Makefile.in
+@@ -368,6 +368,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28219,25 +23742,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
- all: docs-am  all-am
+@@ -709,7 +712,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .c .cc .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -747,9 +750,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28247,19 +23761,93 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -1423,18 +1426,18 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
  
- mostlyclean-libtool:
---- kdesktop/pics/Makefile.in
-+++ kdesktop/pics/Makefile.in
-@@ -160,6 +160,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -262,6 +263,9 @@
+ #>+ 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 +1461,11 @@
+ mocs: desktop.moc
+ 
+ #>+ 3
+-kdiconview.moc: $(srcdir)/kdiconview.h
+-	$(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
++pixmapserver.moc: $(srcdir)/pixmapserver.h
++	$(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
+ 
+ #>+ 2
+-mocs: kdiconview.moc
++mocs: pixmapserver.moc
+ 
+ #>+ 3
+ kcustommenu.moc: $(srcdir)/kcustommenu.h
+@@ -1472,11 +1475,11 @@
+ mocs: kcustommenu.moc
+ 
+ #>+ 3
+-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: pixmapserver.moc
++mocs: kdiconview.moc
+ 
+ #>+ 3
+ xautolock.moc: $(srcdir)/xautolock.h
+@@ -1503,7 +1506,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  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 +1575,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  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 +1587,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  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; \
+--- kdesktop/patterns/Makefile.in
++++ kdesktop/patterns/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28269,16 +23857,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -412,6 +416,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28287,7 +23866,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28299,17 +23878,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdesktop/programs/Makefile.in
-+++ kdesktop/programs/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- kdesktop/pics/Makefile.in
++++ kdesktop/pics/Makefile.in
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28319,16 +23890,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28337,7 +23899,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28349,17 +23911,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdesu/Makefile.in
-+++ kdesu/Makefile.in
-@@ -165,6 +165,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -267,6 +268,9 @@
+--- kdesktop/programs/Makefile.in
++++ kdesktop/programs/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28369,17 +23923,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -417,6 +421,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -557,7 +563,7 @@
- all: docs-am  all-recursive
+@@ -554,7 +557,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -28387,7 +23932,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28401,15 +23946,7 @@
  mostlyclean-libtool:
 --- kdesu/kdesu/Makefile.in
 +++ kdesu/kdesu/Makefile.in
-@@ -188,6 +188,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -290,6 +291,9 @@
+@@ -291,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28419,16 +23956,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,6 +444,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -586,7 +592,7 @@
+@@ -589,7 +592,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28437,7 +23965,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -624,9 +630,9 @@
+@@ -627,9 +630,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28451,15 +23979,7 @@
  	@$(NORMAL_INSTALL)
 --- kdesu/kdesud/Makefile.in
 +++ kdesu/kdesud/Makefile.in
-@@ -190,6 +190,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -292,6 +293,9 @@
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28469,16 +23989,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,6 +446,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -588,7 +594,7 @@
+@@ -591,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28487,7 +23998,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -626,9 +632,9 @@
+@@ -629,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28499,17 +24010,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kdialog/Makefile.in
-+++ kdialog/Makefile.in
-@@ -187,6 +187,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -289,6 +290,9 @@
+--- kdesu/Makefile.in
++++ kdesu/Makefile.in
+@@ -268,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28519,25 +24022,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,6 +443,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -587,7 +593,7 @@
+@@ -560,7 +563,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +631,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28547,19 +24041,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
---- kdm/Makefile.in
-+++ kdm/Makefile.in
-@@ -175,6 +175,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -277,6 +278,9 @@
+ 
+ mostlyclean-libtool:
+--- kdialog/Makefile.in
++++ kdialog/Makefile.in
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28569,25 +24055,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,6 +431,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -572,7 +578,7 @@
- all: docs-am  all-recursive
+@@ -590,7 +593,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +616,9 @@
+@@ -628,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28597,19 +24074,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
 --- kdm/backend/Makefile.in
 +++ kdm/backend/Makefile.in
-@@ -202,6 +202,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -304,6 +305,9 @@
+@@ -305,6 +305,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28619,16 +24088,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -454,6 +458,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -637,7 +643,7 @@
+@@ -640,7 +643,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -28637,7 +24097,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -675,9 +681,9 @@
+@@ -678,9 +681,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28651,15 +24111,7 @@
  	@$(NORMAL_INSTALL)
 --- kdm/kfrontend/Makefile.in
 +++ kdm/kfrontend/Makefile.in
-@@ -243,6 +243,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -345,6 +346,9 @@
+@@ -346,6 +346,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28669,16 +24121,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -495,6 +499,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -631,7 +637,7 @@
+@@ -634,7 +637,7 @@
  xdg_menudir = @xdg_menudir@
  
  # use 'make GENKDMCONF_FLAGS=... install' to override
@@ -28687,7 +24130,7 @@
  SUBDIRS = themer themes pics sessions
  AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \
      -I$(top_srcdir)/kdmlib $(all_includes)
-@@ -686,7 +692,7 @@
+@@ -689,7 +692,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -28696,7 +24139,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -724,9 +730,9 @@
+@@ -727,9 +730,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28710,15 +24153,7 @@
  	@$(NORMAL_INSTALL)
 --- kdm/kfrontend/pics/Makefile.in
 +++ kdm/kfrontend/pics/Makefile.in
-@@ -159,6 +159,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -261,6 +262,9 @@
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28728,16 +24163,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -411,6 +415,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28746,7 +24172,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28760,15 +24186,7 @@
  mostlyclean-libtool:
 --- kdm/kfrontend/sessions/Makefile.in
 +++ kdm/kfrontend/sessions/Makefile.in
-@@ -159,6 +159,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -261,6 +262,9 @@
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28778,16 +24196,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -411,6 +415,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -599,7 +605,7 @@
+@@ -602,7 +605,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -28796,7 +24205,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +643,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28808,7 +24217,7 @@
  	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)/$@
-@@ -801,7 +807,7 @@
+@@ -804,7 +807,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -28819,15 +24228,7 @@
  docs-am:
 --- kdm/kfrontend/themer/Makefile.in
 +++ kdm/kfrontend/themer/Makefile.in
-@@ -187,6 +187,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -289,6 +290,9 @@
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28837,16 +24238,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,6 +443,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -594,7 +600,7 @@
+@@ -597,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -28855,7 +24247,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +638,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28867,7 +24259,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-@@ -878,18 +884,18 @@
+@@ -881,18 +884,18 @@
  mocs: kdmitem.moc
  
  #>+ 3
@@ -28892,7 +24284,7 @@
  
  #>+ 3
  kdmrect.moc: $(srcdir)/kdmrect.h
-@@ -900,7 +906,7 @@
+@@ -903,7 +906,7 @@
  
  #>+ 3
  clean-metasources:
@@ -28901,7 +24293,7 @@
  
  #>+ 2
  KDE_DIST=Makefile.in kdmthemer.h kdmitem.h kdmlayout.h kdmpixmap.h kdmlabel.h kdmrect.h Makefile.am 
-@@ -947,7 +953,7 @@
+@@ -950,7 +953,7 @@
  
  
  #>+ 11
@@ -28910,7 +24302,7 @@
  	@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; \
-@@ -989,8 +995,8 @@
+@@ -992,8 +995,8 @@
  kdmlabel.o: kdmlabel.moc 
  $(srcdir)/kdmitem.cpp: ../../config.ci 
  $(srcdir)/kdmlayout.cpp: ../../config.ci 
@@ -28920,17 +24312,42 @@
  kdmitem.lo: kdmitem.moc 
  kdmpixmap.lo: kdmpixmap.moc 
  nmcheck: 
+--- kdm/kfrontend/themes/circles/Makefile.in
++++ kdm/kfrontend/themes/circles/Makefile.in
+@@ -261,6 +261,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -563,7 +566,7 @@
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -601,9 +604,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- kdm/kfrontend/themes/Makefile.in
 +++ kdm/kfrontend/themes/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28940,16 +24357,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -28958,7 +24366,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -28970,17 +24378,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kdm/kfrontend/themes/circles/Makefile.in
-+++ kdm/kfrontend/themes/circles/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- kdm/Makefile.in
++++ kdm/Makefile.in
+@@ -278,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28990,17 +24390,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -560,7 +566,7 @@
- all: docs-am  all-am
+@@ -575,7 +578,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -29008,7 +24399,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +604,9 @@
+@@ -613,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29022,15 +24413,7 @@
  mostlyclean-libtool:
 --- kdmlib/Makefile.in
 +++ kdmlib/Makefile.in
-@@ -204,6 +204,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -306,6 +307,9 @@
+@@ -307,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29040,16 +24423,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -456,6 +460,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -617,7 +623,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29058,7 +24432,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +661,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29072,15 +24446,7 @@
  	@$(NORMAL_INSTALL)
 --- kfind/Makefile.in
 +++ kfind/Makefile.in
-@@ -236,6 +236,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -338,6 +339,9 @@
+@@ -339,6 +339,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29090,16 +24456,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -488,6 +492,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -653,7 +659,7 @@
+@@ -656,7 +659,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29108,7 +24465,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -691,9 +697,9 @@
+@@ -694,9 +697,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29120,7 +24477,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1246,8 +1252,6 @@
+@@ -1249,8 +1252,6 @@
  
  #>+ 19
  install-kde-icons:
@@ -29129,7 +24486,7 @@
  	$(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
-@@ -1256,13 +1260,15 @@
+@@ -1259,13 +1260,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
@@ -29148,15 +24505,7 @@
  force-reedit:
 --- kfind/pics/Makefile.in
 +++ kfind/pics/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29166,16 +24515,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29184,7 +24524,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29196,7 +24536,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,22 +738,22 @@
+@@ -735,22 +738,22 @@
  #>+ 19
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kfind_pics_datadir)/locolor/22x22/actions
@@ -29229,17 +24569,42 @@
  
  #>+ 15
  force-reedit:
+--- khelpcenter/htmlsearch/Makefile.in
++++ khelpcenter/htmlsearch/Makefile.in
+@@ -330,6 +330,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -648,7 +651,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -686,9 +689,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- khelpcenter/Makefile.in
 +++ khelpcenter/Makefile.in
-@@ -248,6 +248,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -350,6 +351,9 @@
+@@ -351,6 +351,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29249,16 +24614,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -500,6 +504,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -692,7 +698,7 @@
+@@ -695,7 +698,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29267,7 +24623,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -730,9 +736,9 @@
+@@ -733,9 +736,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29279,7 +24635,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1305,11 +1311,11 @@
+@@ -1308,11 +1311,11 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
  
  #>+ 3
@@ -29294,7 +24650,7 @@
  
  #>+ 3
  navigator.moc: $(srcdir)/navigator.h
-@@ -1319,11 +1325,11 @@
+@@ -1322,11 +1325,11 @@
  mocs: navigator.moc
  
  #>+ 3
@@ -29309,7 +24665,7 @@
  
  #>+ 3
  fontdialog.moc: $(srcdir)/fontdialog.h
-@@ -1434,10 +1440,10 @@
+@@ -1437,10 +1440,10 @@
  
  #>+ 3
  clean-metasources:
@@ -29322,7 +24678,7 @@
  
  #>+ 6
  clean-idl:
-@@ -1497,7 +1503,7 @@
+@@ -1500,7 +1503,7 @@
  
  
  #>+ 11
@@ -29331,67 +24687,9 @@
  	@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; \
---- khelpcenter/htmlsearch/Makefile.in
-+++ khelpcenter/htmlsearch/Makefile.in
-@@ -227,6 +227,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -329,6 +330,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -479,6 +483,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -645,7 +651,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -683,9 +689,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
 --- khelpcenter/pics/Makefile.in
 +++ khelpcenter/pics/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29401,16 +24699,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -542,7 +548,7 @@
+@@ -545,7 +548,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29419,7 +24708,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +586,9 @@
+@@ -583,9 +586,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29431,7 +24720,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,29 +738,29 @@
+@@ -735,29 +738,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -29472,15 +24761,7 @@
  force-reedit:
 --- khelpcenter/plugins/Applications/Makefile.in
 +++ khelpcenter/plugins/Applications/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29490,16 +24771,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29508,7 +24780,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29522,15 +24794,7 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Makefile.in
 +++ khelpcenter/plugins/Makefile.in
-@@ -174,6 +174,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -276,6 +277,9 @@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29540,16 +24804,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,6 +430,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -572,7 +578,7 @@
+@@ -575,7 +578,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -29558,7 +24813,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +616,9 @@
+@@ -613,9 +616,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29572,15 +24827,7 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Manpages/Makefile.in
 +++ khelpcenter/plugins/Manpages/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29590,16 +24837,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -553,7 +559,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29608,7 +24846,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +597,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29622,15 +24860,7 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Scrollkeeper/Makefile.in
 +++ khelpcenter/plugins/Scrollkeeper/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29640,16 +24870,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29658,7 +24879,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29672,15 +24893,7 @@
  mostlyclean-libtool:
 --- khelpcenter/plugins/Tutorials/Makefile.in
 +++ khelpcenter/plugins/Tutorials/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29690,16 +24903,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29708,7 +24912,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29722,15 +24926,7 @@
  mostlyclean-libtool:
 --- khelpcenter/searchhandlers/Makefile.in
 +++ khelpcenter/searchhandlers/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29740,16 +24936,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -562,7 +568,7 @@
+@@ -565,7 +568,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -29758,7 +24945,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -600,9 +606,9 @@
+@@ -603,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29770,17 +24957,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  khc_docbookdig.pl: $(top_builddir)/config.status $(srcdir)/khc_docbookdig.pl.in
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
---- khotkeys/Makefile.in
-+++ khotkeys/Makefile.in
-@@ -175,6 +175,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -277,6 +278,9 @@
+--- khotkeys/app/Makefile.in
++++ khotkeys/app/Makefile.in
+@@ -326,6 +326,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29790,34 +24969,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,6 +431,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -561,7 +567,7 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--SUBDIRS = shared kcontrol app data update
-+SUBDIRS = shared kcontrol app data update $(KHOTKEYS_ARTS_SUBDIR)
- khotkeys_autostart_DATA = khotkeys.desktop
- khotkeys_autostartdir = $(datadir)/autostart
- EXTRA_DIST = $(khotkeys_autostart_DATA) COPYING AUTHORS
-@@ -570,7 +576,7 @@
- all: docs-am  all-recursive
+@@ -643,7 +646,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -608,9 +614,9 @@
+@@ -681,9 +684,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29827,19 +24988,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- khotkeys/app/Makefile.in
-+++ khotkeys/app/Makefile.in
-@@ -223,6 +223,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -325,6 +326,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- khotkeys/arts/Makefile.in
++++ khotkeys/arts/Makefile.in
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29849,16 +25002,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -475,6 +479,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -640,7 +646,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -29867,7 +25011,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -678,9 +684,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -29879,1032 +25023,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- khotkeys/arts/Makefile.in
-+++ khotkeys/arts/Makefile.in
-@@ -0,0 +1,1012 @@
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+target_triplet = @target@
-+subdir = khotkeys/arts
-+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(kde_moduledir)"
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(kde_module_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+khotkeys_arts_la_DEPENDENCIES = ../shared/libkhotkeys_shared.la \
-+	$(am__DEPENDENCIES_1)
-+am_khotkeys_arts_la_OBJECTS = soundrecorder_arts.lo \
-+	voicerecorder_arts.lo
-+#>- khotkeys_arts_la_OBJECTS = $(am_khotkeys_arts_la_OBJECTS)
-+#>+ 5
-+khotkeys_arts_la_final_OBJECTS = khotkeys_arts_la.all_cpp.lo 
-+khotkeys_arts_la_nofinal_OBJECTS = soundrecorder_arts.lo \
-+	voicerecorder_arts.lo
-+ at KDE_USE_FINAL_FALSE@khotkeys_arts_la_OBJECTS = $(khotkeys_arts_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@khotkeys_arts_la_OBJECTS = $(khotkeys_arts_la_final_OBJECTS)
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(khotkeys_arts_la_SOURCES)
-+DIST_SOURCES = $(khotkeys_arts_la_SOURCES)
-+HEADERS = $(noinst_HEADERS)
-+ETAGS = etags
-+CTAGS = ctags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
-+ARTSCCONFIG = @ARTSCCONFIG@
-+ARTS_CFLAGS = @ARTS_CFLAGS@
-+AUTOCONF = @AUTOCONF@
-+AUTODIRS = @AUTODIRS@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@
-+COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@
-+CONF_FILES = @CONF_FILES@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DBUSQT_INCS = @DBUSQT_INCS@
-+DBUSQT_LIBS = @DBUSQT_LIBS@
-+DBUS_CFLAGS = @DBUS_CFLAGS@
-+DBUS_INCS = @DBUS_INCS@
-+DBUS_LIBS = @DBUS_LIBS@
-+DCOPIDL = @DCOPIDL@
-+DCOPIDL2CPP = @DCOPIDL2CPP@
-+DCOPIDLNG = @DCOPIDLNG@
-+DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+DOXYGEN = @DOXYGEN@
-+DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@
-+DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@
-+DPMSINC = @DPMSINC@
-+DPMSLIB = @DPMSLIB@
-+ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
-+EXEEXT = @EXEEXT@
-+EXR_FLAGS = @EXR_FLAGS@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-+GLINC = @GLINC@
-+GLLIB = @GLLIB@
-+GMSGFMT = @GMSGFMT@
-+HALBACKEND = @HALBACKEND@
-+HAL_CFLAGS = @HAL_CFLAGS@
-+HAL_INCS = @HAL_INCS@
-+HAL_LIBS = @HAL_LIBS@
-+HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@
-+HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@
-+HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JAR = @JAR@
-+JAVAC = @JAVAC@
-+JAVAH = @JAVAH@
-+JVMLIBS = @JVMLIBS@
-+KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-+KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@
-+KCONFIG_COMPILER = @KCONFIG_COMPILER@
-+KDECONFIG = @KDECONFIG@
-+KDE_BINDIR = @KDE_BINDIR@
-+KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
-+KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-+KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@
-+KDE_HAVE_DOT = @KDE_HAVE_DOT@
-+KDE_INCLUDES = @KDE_INCLUDES@
-+KDE_LDFLAGS = @KDE_LDFLAGS@
-+KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-+KDE_MT_LIBS = @KDE_MT_LIBS@
-+KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-+KDE_PLUGIN = @KDE_PLUGIN@
-+KDE_RPATH = @KDE_RPATH@
-+KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-+KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-+KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-+KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-+KDE_USE_FPIE = @KDE_USE_FPIE@
-+KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-+KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-+KDE_USE_PIE = @KDE_USE_PIE@
-+KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-+KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
-+KRB4_INCS = @KRB4_INCS@
-+KRB4_LIBS = @KRB4_LIBS@
-+KRB4_RPATH = @KRB4_RPATH@
-+KRB5_INCS = @KRB5_INCS@
-+KRB5_LIBS = @KRB5_LIBS@
-+KRB5_RPATH = @KRB5_RPATH@
-+KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@
-+LDAP_INCS = @LDAP_INCS@
-+LDAP_LIBS = @LDAP_LIBS@
-+LDAP_RPATH = @LDAP_RPATH@
-+LDFLAGS = @LDFLAGS@
-+LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-+LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
-+LIBALIB = @LIBALIB@
-+LIBART_CFLAGS = @LIBART_CFLAGS@
-+LIBART_LIBS = @LIBART_LIBS@
-+LIBART_RPATH = @LIBART_RPATH@
-+LIBBZ2 = @LIBBZ2@
-+LIBCFG = @LIBCFG@
-+LIBCOMPAT = @LIBCOMPAT@
-+LIBCRYPT = @LIBCRYPT@
-+LIBCURSES = @LIBCURSES@
-+LIBDEVINFO = @LIBDEVINFO@
-+LIBDL = @LIBDL@
-+LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@
-+LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@
-+LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@
-+LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@
-+LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@
-+LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@
-+LIBGEN = @LIBGEN@
-+LIBHOSTS = @LIBHOSTS@
-+LIBJPEG = @LIBJPEG@
-+LIBKSTAT = @LIBKSTAT@
-+LIBMALLOC = @LIBMALLOC@
-+LIBOBJS = @LIBOBJS@
-+LIBODM = @LIBODM@
-+LIBOSSAUDIO = @LIBOSSAUDIO@
-+LIBPNG = @LIBPNG@
-+LIBPOSIX4 = @LIBPOSIX4@
-+LIBPTHREAD = @LIBPTHREAD@
-+LIBRESOLV = @LIBRESOLV@
-+LIBRPC = @LIBRPC@
-+LIBS = @LIBS@
-+LIBSENSORS = @LIBSENSORS@
-+LIBSHADOW = @LIBSHADOW@
-+LIBSM = @LIBSM@
-+LIBSOCKET = @LIBSOCKET@
-+LIBSSL = @LIBSSL@
-+LIBTOOL = @LIBTOOL@
-+LIBUCB = @LIBUCB@
-+LIBUSBCONFIG = @LIBUSBCONFIG@
-+LIBUTEMPTER = @LIBUTEMPTER@
-+LIBUTIL = @LIBUTIL@
-+LIBXDMCP = @LIBXDMCP@
-+LIBXFT_LIB = @LIBXFT_LIB@
-+LIBZ = @LIBZ@
-+LIB_ARTS = @LIB_ARTS@
-+LIB_DNSSD = @LIB_DNSSD@
-+LIB_EXR = @LIB_EXR@
-+LIB_FONT_ENC = @LIB_FONT_ENC@
-+LIB_KAB = @LIB_KAB@
-+LIB_KABC = @LIB_KABC@
-+LIB_KDECORE = @LIB_KDECORE@
-+LIB_KDED = @LIB_KDED@
-+LIB_KDEPIM = @LIB_KDEPIM@
-+LIB_KDEPRINT = @LIB_KDEPRINT@
-+LIB_KDEUI = @LIB_KDEUI@
-+LIB_KDNSSD = @LIB_KDNSSD@
-+LIB_KFILE = @LIB_KFILE@
-+LIB_KFM = @LIB_KFM@
-+LIB_KHTML = @LIB_KHTML@
-+LIB_KIMPROXY = @LIB_KIMPROXY@
-+LIB_KIO = @LIB_KIO@
-+LIB_KJS = @LIB_KJS@
-+LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
-+LIB_KPARTS = @LIB_KPARTS@
-+LIB_KSPELL = @LIB_KSPELL@
-+LIB_KSYCOCA = @LIB_KSYCOCA@
-+LIB_KUNITTEST = @LIB_KUNITTEST@
-+LIB_KUTILS = @LIB_KUTILS@
-+LIB_KVM = @LIB_KVM@
-+LIB_LBER = @LIB_LBER@
-+LIB_LIBS = @LIB_LIBS@
-+LIB_POLL = @LIB_POLL@
-+LIB_QPE = @LIB_QPE@
-+LIB_QT = @LIB_QT@
-+LIB_SMB = @LIB_SMB@
-+LIB_TRU64_MACH = @LIB_TRU64_MACH@
-+LIB_X11 = @LIB_X11@
-+LIB_XCOMPOSITE = @LIB_XCOMPOSITE@
-+LIB_XCURSOR = @LIB_XCURSOR@
-+LIB_XEXT = @LIB_XEXT@
-+LIB_XF86MISC = @LIB_XF86MISC@
-+LIB_XFIXES = @LIB_XFIXES@
-+LIB_XINERAMA = @LIB_XINERAMA@
-+LIB_XRANDR = @LIB_XRANDR@
-+LIB_XRENDER = @LIB_XRENDER@
-+LIB_XSS = @LIB_XSS@
-+LINUXCDPOLLING = @LINUXCDPOLLING@
-+LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-+MAKEINFO = @MAKEINFO@
-+MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
-+MCOPIDL = @MCOPIDL@
-+MD5SUM = @MD5SUM@
-+MD5SUM_CUT = @MD5SUM_CUT@
-+MEINPROC = @MEINPROC@
-+MOC = @MOC@
-+MSGFMT = @MSGFMT@
-+NOOPT_CFLAGS = @NOOPT_CFLAGS@
-+NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
-+PAMLIBS = @PAMLIBS@
-+PASSWDLIBS = @PASSWDLIBS@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+PERL = @PERL@
-+PKG_CONFIG = @PKG_CONFIG@
-+QTDOCDIR = @QTDOCDIR@
-+QTE_NORTTI = @QTE_NORTTI@
-+QT_INCLUDES = @QT_INCLUDES@
-+QT_LDFLAGS = @QT_LDFLAGS@
-+RANLIB = @RANLIB@
-+RUN_KAPPFINDER = @RUN_KAPPFINDER@
-+SASL2_LIBS = @SASL2_LIBS@
-+SETUIDFLAGS = @SETUIDFLAGS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@
-+SSL_INCLUDES = @SSL_INCLUDES@
-+SSL_LDFLAGS = @SSL_LDFLAGS@
-+STRIP = @STRIP@
-+TOPSUBDIRS = @TOPSUBDIRS@
-+UIC = @UIC@
-+UIC_TR = @UIC_TR@
-+UNAME = @UNAME@
-+USB_CFLAGS = @USB_CFLAGS@
-+USB_LIBS = @USB_LIBS@
-+USER_INCLUDES = @USER_INCLUDES@
-+USER_LDFLAGS = @USER_LDFLAGS@
-+USE_EXCEPTIONS = @USE_EXCEPTIONS@
-+USE_RTTI = @USE_RTTI@
-+USE_THREADS = @USE_THREADS@
-+VERSION = @VERSION@
-+WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-+XGETTEXT = @XGETTEXT@
-+XMLLINT = @XMLLINT@
-+XTESTLIB = @XTESTLIB@
-+X_EXTRA_LIBS = @X_EXTRA_LIBS@
-+X_INCLUDES = @X_INCLUDES@
-+X_LDFLAGS = @X_LDFLAGS@
-+X_PRE_LIBS = @X_PRE_LIBS@
-+X_RPATH = @X_RPATH@
-+ac_ct_AR = @ac_ct_AR@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+ac_ct_RANLIB = @ac_ct_RANLIB@
-+ac_ct_STRIP = @ac_ct_STRIP@
-+all_includes = @all_includes@
-+all_libraries = @all_libraries@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@
-+applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@
-+doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@
-+drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@
-+drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@
-+exec_prefix = @exec_prefix@
-+have_xcursor_FALSE = @have_xcursor_FALSE@
-+have_xcursor_TRUE = @have_xcursor_TRUE@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+include_ARTS_FALSE = @include_ARTS_FALSE@
-+include_ARTS_TRUE = @include_ARTS_TRUE@
-+include_BZIP2_FALSE = @include_BZIP2_FALSE@
-+include_BZIP2_TRUE = @include_BZIP2_TRUE@
-+include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@
-+include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@
-+include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@
-+include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@
-+include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@
-+include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@
-+include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@
-+include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@
-+include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@
-+include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@
-+include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@
-+include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@
-+include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@
-+include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@
-+include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@
-+include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@
-+include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@
-+include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@
-+include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@
-+include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@
-+include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@
-+include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@
-+include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@
-+include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@
-+include_kompmgr_FALSE = @include_kompmgr_FALSE@
-+include_kompmgr_TRUE = @include_kompmgr_TRUE@
-+include_ksysguardd_FALSE = @include_ksysguardd_FALSE@
-+include_ksysguardd_TRUE = @include_ksysguardd_TRUE@
-+include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@
-+include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@
-+include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@
-+include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@
-+include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@
-+include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@
-+include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@
-+include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@
-+include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@
-+include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@
-+include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@
-+include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@
-+include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@
-+include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@
-+include_media_halbackend_FALSE = @include_media_halbackend_FALSE@
-+include_media_halbackend_TRUE = @include_media_halbackend_TRUE@
-+include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@
-+include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@
-+include_x11_FALSE = @include_x11_FALSE@
-+include_x11_TRUE = @include_x11_TRUE@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
-+jni_includes = @jni_includes@
-+kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
-+kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-+kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@
-+kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@
-+kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@
-+kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@
-+kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@
-+kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@
-+kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@
-+kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@
-+kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@
-+kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@
-+kde_appsdir = @kde_appsdir@
-+kde_bindir = @kde_bindir@
-+kde_confdir = @kde_confdir@
-+kde_datadir = @kde_datadir@
-+kde_htmldir = @kde_htmldir@
-+kde_icondir = @kde_icondir@
-+kde_includes = @kde_includes@
-+kde_kcfgdir = @kde_kcfgdir@
-+kde_libraries = @kde_libraries@
-+kde_libs_htmldir = @kde_libs_htmldir@
-+kde_libs_prefix = @kde_libs_prefix@
-+kde_locale = @kde_locale@
-+kde_mimedir = @kde_mimedir@
-+kde_moduledir = @kde_moduledir@
-+kde_qtver = @kde_qtver@
-+kde_servicesdir = @kde_servicesdir@
-+kde_servicetypesdir = @kde_servicetypesdir@
-+kde_sounddir = @kde_sounddir@
-+kde_styledir = @kde_styledir@
-+kde_templatesdir = @kde_templatesdir@
-+kde_wallpaperdir = @kde_wallpaperdir@
-+kde_widgetdir = @kde_widgetdir@
-+kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@
-+kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@
-+kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@
-+kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@
-+kdeinitdir = @kdeinitdir@
-+kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@
-+kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@
-+kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@
-+kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@
-+kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@
-+kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@
-+kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@
-+kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@
-+kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@
-+kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@
-+kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@
-+kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@
-+kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@
-+kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@
-+kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@
-+kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@
-+khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@
-+khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@
-+khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@
-+khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@
-+kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@
-+kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@
-+kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@
-+kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@
-+klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@
-+klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@
-+kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@
-+kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@
-+knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@
-+knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@
-+konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@
-+konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@
-+konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@
-+konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@
-+kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@
-+kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@
-+kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@
-+kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@
-+kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@
-+kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@
-+kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@
-+kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@
-+ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@
-+ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@
-+ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@
-+ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@
-+kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@
-+kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@
-+ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@
-+ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@
-+ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@
-+ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@
-+ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@
-+ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@
-+kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@
-+kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@
-+kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@
-+kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@
-+l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@
-+l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@
-+libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+nogroup = @nogroup@
-+nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@
-+nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@
-+oldincludedir = @oldincludedir@
-+pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@
-+pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+qt_includes = @qt_includes@
-+qt_libraries = @qt_libraries@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+supports_i8k_FALSE = @supports_i8k_FALSE@
-+supports_i8k_TRUE = @supports_i8k_TRUE@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
-+unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
-+unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
-+x_includes = @x_includes@
-+x_libraries = @x_libraries@
-+xdg_appsdir = @xdg_appsdir@
-+xdg_directorydir = @xdg_directorydir@
-+xdg_menudir = @xdg_menudir@
-+kde_module_LTLIBRARIES = khotkeys_arts.la
-+khotkeys_arts_la_SOURCES = soundrecorder_arts.cpp voicerecorder_arts.cpp
-+khotkeys_arts_la_LIBADD = ../shared/libkhotkeys_shared.la $(LIB_ARTS)
-+#>- khotkeys_arts_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -module -avoid-version -no-undefined
-+#>+ 1
-+khotkeys_arts_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
-+INCLUDES = $(all_includes) -I$(srcdir)/../shared/ -I$(srcdir)/../kcontrol -I../kcontrol
-+noinst_HEADERS = soundrecorder_arts.h
-+#>- METASOURCES = AUTO
-+#>- all: all-am
-+#>+ 1
-+all: docs-am  all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .cpp .lo .o .obj
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  khotkeys/arts/Makefile'; \
-+#>- 	cd $(top_srcdir) && \
-+#>- 	  $(AUTOMAKE) --foreign  khotkeys/arts/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  khotkeys/arts/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  khotkeys/arts/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit khotkeys/arts/Makefile.in
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
-+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+	  if test -f $$p; then \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
-+	  else :; fi; \
-+	done
-+
-+uninstall-kde_moduleLTLIBRARIES:
-+	@$(NORMAL_UNINSTALL)
-+	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
-+	done
-+
-+clean-kde_moduleLTLIBRARIES:
-+	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
-+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test "$$dir" != "$$p" || dir=.; \
-+	  echo "rm -f \"$${dir}/so_locations\""; \
-+	  rm -f "$${dir}/so_locations"; \
-+	done
-+#>- khotkeys_arts.la: $(khotkeys_arts_la_OBJECTS) $(khotkeys_arts_la_DEPENDENCIES) 
-+#>+ 2
-+ at KDE_USE_CLOSURE_TRUE@khotkeys_arts.la: khotkeys_arts.la.closure $(khotkeys_arts_la_OBJECTS) $(khotkeys_arts_la_DEPENDENCIES) 
-+ at KDE_USE_CLOSURE_FALSE@khotkeys_arts.la: $(khotkeys_arts_la_OBJECTS) $(khotkeys_arts_la_DEPENDENCIES) 
-+	$(CXXLINK) -rpath $(kde_moduledir) $(khotkeys_arts_la_LDFLAGS) $(khotkeys_arts_la_OBJECTS) $(khotkeys_arts_la_LIBADD) $(LIBS)
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/soundrecorder_arts.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/voicerecorder_arts.Plo at am__quote@
-+
-+.cpp.o:
-+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-+
-+.cpp.obj:
-+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+.cpp.lo:
-+ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
-+
-+clean-libtool:
-+	-rm -rf .libs _libs
-+
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(kde_moduledir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+#>- clean: clean-am
-+#>+ 1
-+clean: kde-rpo-clean  clean-am
-+
-+#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
-+#>- 	mostlyclean-am
-+#>+ 2
-+clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \
-+	mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-libtool distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+info: info-am
-+
-+info-am:
-+
-+#>- install-data-am: install-kde_moduleLTLIBRARIES
-+#>+ 1
-+install-data-am:   
-+
-+#>- install-exec-am:
-+#>+ 1
-+install-exec-am:  install-kde_moduleLTLIBRARIES
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am \
-+	install-kde_moduleLTLIBRARIES install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-info-am \
-+	uninstall-kde_moduleLTLIBRARIES
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-+
-+#>+ 8
-+khotkeys_arts.la.closure: $(khotkeys_arts_la_OBJECTS) $(khotkeys_arts_la_DEPENDENCIES)
-+	@echo "int main() {return 0;}" > khotkeys_arts_la_closure.cpp
-+	@$(LTCXXCOMPILE) -c khotkeys_arts_la_closure.cpp
-+	$(CXXLINK) khotkeys_arts_la_closure.lo $(khotkeys_arts_la_LDFLAGS) $(khotkeys_arts_la_OBJECTS) $(khotkeys_arts_la_LIBADD) $(LIBS)
-+	@rm -f khotkeys_arts_la_closure.* khotkeys_arts.la.closure
-+	@echo "timestamp" > khotkeys_arts.la.closure
-+
-+
-+#>+ 3
-+soundrecorder_arts.moc: $(srcdir)/soundrecorder_arts.h
-+	$(MOC) $(srcdir)/soundrecorder_arts.h -o soundrecorder_arts.moc
-+
-+#>+ 2
-+mocs: soundrecorder_arts.moc
-+
-+#>+ 3
-+clean-metasources:
-+	-rm -f  soundrecorder_arts.moc
-+
-+#>+ 2
-+KDE_DIST=Makefile.in Makefile.am 
-+
-+#>+ 3
-+clean-closures:
-+	-rm -f  khotkeys_arts.la.closure
-+
-+#>+ 2
-+docs-am:
-+
-+#>+ 15
-+force-reedit:
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  khotkeys/arts/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  khotkeys/arts/Makefile
-+	cd $(top_srcdir) && perl admin/am_edit khotkeys/arts/Makefile.in
-+
-+
-+#>+ 21
-+clean-bcheck: 
-+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-+
-+bcheck: bcheck-am
-+
-+bcheck-am:
-+	@for i in ; do \
-+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-+	        echo "$$i"; \
-+	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-+	            rm -f $$i.bchecktest.cc; exit 1; \
-+	        fi ; \
-+	        echo "" >> $$i.bchecktest.cc.class; \
-+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-+	        rm -f a.out; \
-+	    fi ; \
-+	done
-+
-+
-+#>+ 11
-+khotkeys_arts_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/soundrecorder_arts.cpp $(srcdir)/voicerecorder_arts.cpp  soundrecorder_arts.moc
-+	@echo 'creating khotkeys_arts_la.all_cpp.cpp ...'; \
-+	rm -f khotkeys_arts_la.all_cpp.files khotkeys_arts_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> khotkeys_arts_la.all_cpp.final; \
-+	for file in soundrecorder_arts.cpp voicerecorder_arts.cpp ; do \
-+	  echo "#include \"$$file\"" >> khotkeys_arts_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys_arts_la.all_cpp.final; \
-+	done; \
-+	cat khotkeys_arts_la.all_cpp.final khotkeys_arts_la.all_cpp.files > khotkeys_arts_la.all_cpp.cpp; \
-+	rm -f khotkeys_arts_la.all_cpp.final khotkeys_arts_la.all_cpp.files
-+
-+#>+ 3
-+clean-final:
-+	-rm -f khotkeys_arts_la.all_cpp.cpp
-+
-+#>+ 3
-+final:
-+	$(MAKE) khotkeys_arts_la_OBJECTS="$(khotkeys_arts_la_final_OBJECTS)" all-am
-+
-+#>+ 3
-+final-install:
-+	$(MAKE) khotkeys_arts_la_OBJECTS="$(khotkeys_arts_la_final_OBJECTS)" install-am
-+
-+#>+ 3
-+no-final:
-+	$(MAKE) khotkeys_arts_la_OBJECTS="$(khotkeys_arts_la_nofinal_OBJECTS)" all-am
-+
-+#>+ 3
-+no-final-install:
-+	$(MAKE) khotkeys_arts_la_OBJECTS="$(khotkeys_arts_la_nofinal_OBJECTS)" install-am
-+
-+#>+ 3
-+kde-rpo-clean:
-+	-rm -f *.rpo
-+
-+#>+ 5
-+nmcheck: 
-+nmcheck-am: nmcheck
-+soundrecorder_arts.lo: soundrecorder_arts.moc 
-+soundrecorder_arts.o: soundrecorder_arts.moc 
 --- khotkeys/data/Makefile.in
 +++ khotkeys/data/Makefile.in
-@@ -160,6 +160,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -262,6 +263,9 @@
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30914,16 +25035,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -412,6 +416,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
+@@ -559,7 +562,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -30932,7 +25044,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30946,15 +25058,7 @@
  mostlyclean-libtool:
 --- khotkeys/kcontrol/Makefile.in
 +++ khotkeys/kcontrol/Makefile.in
-@@ -238,6 +238,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -340,6 +341,9 @@
+@@ -341,6 +341,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30964,16 +25068,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,6 +494,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -665,7 +671,7 @@
+@@ -668,7 +671,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -30982,7 +25077,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -703,9 +709,9 @@
+@@ -706,9 +709,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -30994,7 +25089,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1159,13 +1165,6 @@
+@@ -1162,13 +1165,6 @@
  mocs: gestures_settings_tab.moc
  
  #>+ 3
@@ -31008,7 +25103,7 @@
  gesture_triggers_tab.moc: $(srcdir)/gesture_triggers_tab.h
  	$(MOC) $(srcdir)/gesture_triggers_tab.h -o gesture_triggers_tab.moc
  
-@@ -1173,11 +1172,11 @@
+@@ -1176,11 +1172,11 @@
  mocs: gesture_triggers_tab.moc
  
  #>+ 3
@@ -31023,7 +25118,7 @@
  
  #>+ 3
  voicerecorder.moc: $(srcdir)/voicerecorder.h
-@@ -1187,6 +1186,13 @@
+@@ -1190,6 +1186,13 @@
  mocs: voicerecorder.moc
  
  #>+ 3
@@ -31037,7 +25132,7 @@
  tab_widget.moc: $(srcdir)/tab_widget.h
  	$(MOC) $(srcdir)/tab_widget.h -o tab_widget.moc
  
-@@ -1222,6 +1228,13 @@
+@@ -1225,6 +1228,13 @@
  mocs: action_list_widget.moc
  
  #>+ 3
@@ -31051,7 +25146,7 @@
  main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
  	$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
  
-@@ -1236,13 +1249,6 @@
+@@ -1239,13 +1249,6 @@
  mocs: menuentry_widget.moc
  
  #>+ 3
@@ -31065,7 +25160,7 @@
  general_tab.moc: $(srcdir)/general_tab.h
  	$(MOC) $(srcdir)/general_tab.h -o general_tab.moc
  
-@@ -1271,6 +1277,13 @@
+@@ -1274,6 +1277,13 @@
  mocs: gesturerecordpage.moc
  
  #>+ 3
@@ -31079,7 +25174,7 @@
  windowselector.moc: $(srcdir)/windowselector.h
  	$(MOC) $(srcdir)/windowselector.h -o windowselector.moc
  
-@@ -1285,13 +1298,6 @@
+@@ -1288,13 +1298,6 @@
  mocs: command_url_widget.moc
  
  #>+ 3
@@ -31093,7 +25188,7 @@
  keyboard_input_widget.moc: $(srcdir)/keyboard_input_widget.h
  	$(MOC) $(srcdir)/keyboard_input_widget.h -o keyboard_input_widget.moc
  
-@@ -1330,7 +1336,7 @@
+@@ -1333,7 +1336,7 @@
  
  #>+ 3
  clean-metasources:
@@ -31102,7 +25197,7 @@
  
  #>+ 2
  KDE_DIST=hi32-app-khotkeys.png Makefile.in khotkeys.desktop hi16-app-khotkeys.png Makefile.am 
-@@ -1344,14 +1350,14 @@
+@@ -1347,14 +1350,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -31120,7 +25215,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1392,7 +1398,7 @@
+@@ -1395,7 +1398,7 @@
  
  
  #>+ 11
@@ -31131,15 +25226,7 @@
  	echo "#define KDE_USE_FINAL 1" >> kcm_khotkeys_la.all_cpp.final; \
 --- khotkeys/kcontrol/ui/Makefile.in
 +++ khotkeys/kcontrol/ui/Makefile.in
-@@ -183,6 +183,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -285,6 +286,9 @@
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31149,16 +25236,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -435,6 +439,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -597,7 +603,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31167,7 +25245,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +641,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31179,7 +25257,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -870,7 +876,7 @@
+@@ -873,7 +876,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -31188,68 +25266,9 @@
  
  #>+ 23
  clean-ui:
---- khotkeys/shared/Makefile.in
-+++ khotkeys/shared/Makefile.in
-@@ -56,18 +56,10 @@
-     *) f=$$p;; \
-   esac;
- am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)"
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
-+am__installdirs = "$(DESTDIR)$(libdir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
--LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-+LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--khotkeys_shared_arts_la_DEPENDENCIES = libkhotkeys_shared.la \
--	$(am__DEPENDENCIES_1)
--am_khotkeys_shared_arts_la_OBJECTS = soundrecorder_arts.lo
--#>- khotkeys_shared_arts_la_OBJECTS =  \
--#>- 	$(am_khotkeys_shared_arts_la_OBJECTS)
--#>+ 1
--khotkeys_shared_arts_la_OBJECTS = soundrecorder_arts.lo
- libkhotkeys_shared_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_libkhotkeys_shared_la_OBJECTS = action_data.lo khotkeysglobal.lo \
-@@ -75,11 +67,14 @@
- 	conditions.lo khlistview.lo khlistbox.lo gestures.lo voices.lo \
- 	voicesignature.lo sound.lo soundrecorder.lo
- #>- libkhotkeys_shared_la_OBJECTS = $(am_libkhotkeys_shared_la_OBJECTS)
--#>+ 4
--libkhotkeys_shared_la_OBJECTS = action_data.lo khotkeysglobal.lo \
-+#>+ 7
-+libkhotkeys_shared_la_final_OBJECTS = libkhotkeys_shared_la.all_cpp.lo 
-+libkhotkeys_shared_la_nofinal_OBJECTS = action_data.lo khotkeysglobal.lo \
- 	triggers.lo windows.lo settings.lo actions.lo input.lo \
- 	conditions.lo khlistview.lo khlistbox.lo gestures.lo voices.lo \
- 	voicesignature.lo sound.lo soundrecorder.lo
-+ at KDE_USE_FINAL_FALSE@libkhotkeys_shared_la_OBJECTS = $(libkhotkeys_shared_la_nofinal_OBJECTS)
-+ at KDE_USE_FINAL_TRUE@libkhotkeys_shared_la_OBJECTS = $(libkhotkeys_shared_la_final_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-@@ -101,10 +96,8 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(khotkeys_shared_arts_la_SOURCES) \
--	$(libkhotkeys_shared_la_SOURCES)
--DIST_SOURCES = $(khotkeys_shared_arts_la_SOURCES) \
--	$(libkhotkeys_shared_la_SOURCES)
-+SOURCES = $(libkhotkeys_shared_la_SOURCES)
-+DIST_SOURCES = $(libkhotkeys_shared_la_SOURCES)
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
- CTAGS = ctags
-@@ -207,6 +200,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -309,6 +303,9 @@
+--- khotkeys/Makefile.in
++++ khotkeys/Makefile.in
+@@ -278,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31259,52 +25278,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -459,6 +456,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -593,9 +592,7 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--KDE_OPTIONS = nofinal
- lib_LTLIBRARIES = libkhotkeys_shared.la
--kde_module_LTLIBRARIES = khotkeys_shared_arts.la
- libkhotkeys_shared_la_SOURCES = action_data.cpp khotkeysglobal.cpp triggers.cpp windows.cpp \
-     settings.cpp actions.cpp input.cpp conditions.cpp khlistview.cpp khlistbox.cpp \
-     gestures.cpp voices.cpp voicesignature.cpp sound.cpp soundrecorder.cpp
-@@ -604,15 +601,10 @@
- #>- libkhotkeys_shared_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -version-info 1:0:0 -no-undefined
- #>+ 1
- libkhotkeys_shared_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -version-info 1:0:0 -no-undefined $(KDE_NO_UNDEFINED)
--khotkeys_shared_arts_la_SOURCES = soundrecorder_arts.cpp
--khotkeys_shared_arts_la_LIBADD = libkhotkeys_shared.la $(LIB_ARTS)
--#>- khotkeys_shared_arts_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -module -avoid-version -no-undefined
--#>+ 1
--khotkeys_shared_arts_la_LDFLAGS = $(all_libraries) $(X_LDFLAGS) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
- INCLUDES = $(all_includes)
- noinst_HEADERS = action_data.h khotkeysglobal.h triggers.h windows.h actions.h input.h \
-     settings.h conditions.h khlistview.h khlistbox.h gestures.h voices.h \
--    voicesignature.h sound.h soundrecorder.h soundrecorder_arts.h
-+    voicesignature.h sound.h soundrecorder.h
+@@ -573,7 +576,7 @@
+ all: docs-am  all-recursive
  
- #>- METASOURCES = AUTO
- #>- all: all-am
-@@ -621,7 +613,7 @@
- 
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -659,37 +651,10 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31314,258 +25297,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
--	@$(NORMAL_INSTALL)
--	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
--	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
--	  else :; fi; \
--	done
--
--uninstall-kde_moduleLTLIBRARIES:
--	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
--	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
--	done
--
--clean-kde_moduleLTLIBRARIES:
--	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
--	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
--	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
--	  test "$$dir" != "$$p" || dir=.; \
--	  echo "rm -f \"$${dir}/so_locations\""; \
--	  rm -f "$${dir}/so_locations"; \
--	done
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-@@ -717,11 +682,6 @@
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
--#>- khotkeys_shared_arts.la: $(khotkeys_shared_arts_la_OBJECTS) $(khotkeys_shared_arts_la_DEPENDENCIES) 
--#>+ 2
-- at KDE_USE_CLOSURE_TRUE@khotkeys_shared_arts.la: khotkeys_shared_arts.la.closure $(khotkeys_shared_arts_la_OBJECTS) $(khotkeys_shared_arts_la_DEPENDENCIES) 
-- at KDE_USE_CLOSURE_FALSE@khotkeys_shared_arts.la: $(khotkeys_shared_arts_la_OBJECTS) $(khotkeys_shared_arts_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(kde_moduledir) $(khotkeys_shared_arts_la_LDFLAGS) $(khotkeys_shared_arts_la_OBJECTS) $(khotkeys_shared_arts_la_LIBADD) $(LIBS)
- #>- libkhotkeys_shared.la: $(libkhotkeys_shared_la_OBJECTS) $(libkhotkeys_shared_la_DEPENDENCIES) 
- #>+ 2
- @KDE_USE_CLOSURE_TRUE at libkhotkeys_shared.la: libkhotkeys_shared.la.closure $(libkhotkeys_shared_la_OBJECTS) $(libkhotkeys_shared_la_DEPENDENCIES) 
-@@ -745,7 +705,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/settings.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sound.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/soundrecorder.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/soundrecorder_arts.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/triggers.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/voices.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/voicesignature.Plo at am__quote@
-@@ -861,7 +820,7 @@
- check: check-am
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
--	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)"; do \
-+	for dir in "$(DESTDIR)$(libdir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
-@@ -892,11 +851,11 @@
- #>+ 1
- clean: kde-rpo-clean  clean-am
  
--#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
--#>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
-+#>- clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-+#>- 	mostlyclean-am
- #>+ 2
--clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES \
--	clean-libLTLIBRARIES clean-libtool mostlyclean-am
-+clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-libLTLIBRARIES clean-libtool \
-+	mostlyclean-am
- 
- distclean: distclean-am
- 	-rm -rf ./$(DEPDIR)
-@@ -914,13 +873,9 @@
- 
- info-am:
- 
--#>- install-data-am: install-kde_moduleLTLIBRARIES
--#>+ 1
--install-data-am:   
-+install-data-am:
- 
--#>- install-exec-am: install-libLTLIBRARIES
--#>+ 1
--install-exec-am:  install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
-+install-exec-am: install-libLTLIBRARIES
- 
- install-info: install-info-am
- 
-@@ -946,34 +901,32 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
--	uninstall-libLTLIBRARIES
-+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
--	clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES clean-libtool \
--	ctags distclean distclean-compile distclean-generic \
--	distclean-libtool distclean-tags distdir dvi dvi-am html \
--	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-kde_moduleLTLIBRARIES \
-+	clean-libLTLIBRARIES clean-libtool ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am \
- 	install-libLTLIBRARIES install-man install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- 	tags uninstall uninstall-am uninstall-info-am \
--	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES
-+	uninstall-libLTLIBRARIES
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 8
--khotkeys_shared_arts.la.closure: $(khotkeys_shared_arts_la_OBJECTS) $(khotkeys_shared_arts_la_DEPENDENCIES)
--	@echo "int main() {return 0;}" > khotkeys_shared_arts_la_closure.cpp
--	@$(LTCXXCOMPILE) -c khotkeys_shared_arts_la_closure.cpp
--	$(CXXLINK) khotkeys_shared_arts_la_closure.lo $(khotkeys_shared_arts_la_LDFLAGS) $(khotkeys_shared_arts_la_OBJECTS) $(khotkeys_shared_arts_la_LIBADD) $(LIBS)
--	@rm -f khotkeys_shared_arts_la_closure.* khotkeys_shared_arts.la.closure
--	@echo "timestamp" > khotkeys_shared_arts.la.closure
-+libkhotkeys_shared.la.closure: $(libkhotkeys_shared_la_OBJECTS) $(libkhotkeys_shared_la_DEPENDENCIES)
-+	@echo "int main() {return 0;}" > libkhotkeys_shared_la_closure.cpp
-+	@$(LTCXXCOMPILE) -c libkhotkeys_shared_la_closure.cpp
-+	$(CXXLINK) libkhotkeys_shared_la_closure.lo $(libkhotkeys_shared_la_LDFLAGS) $(libkhotkeys_shared_la_OBJECTS) $(libkhotkeys_shared_la_LIBADD) $(LIBS)
-+	@rm -f libkhotkeys_shared_la_closure.* libkhotkeys_shared.la.closure
-+	@echo "timestamp" > libkhotkeys_shared.la.closure
- 
- 
- #>+ 3
-@@ -1033,38 +986,22 @@
- mocs: khlistbox.moc
- 
- #>+ 3
--soundrecorder_arts.moc: $(srcdir)/soundrecorder_arts.h
--	$(MOC) $(srcdir)/soundrecorder_arts.h -o soundrecorder_arts.moc
--
--#>+ 2
--mocs: soundrecorder_arts.moc
--
--#>+ 3
- conditions.moc: $(srcdir)/conditions.h
- 	$(MOC) $(srcdir)/conditions.h -o conditions.moc
- 
- #>+ 2
- mocs: conditions.moc
- 
--#>+ 8
--libkhotkeys_shared.la.closure: $(libkhotkeys_shared_la_OBJECTS) $(libkhotkeys_shared_la_DEPENDENCIES)
--	@echo "int main() {return 0;}" > libkhotkeys_shared_la_closure.cpp
--	@$(LTCXXCOMPILE) -c libkhotkeys_shared_la_closure.cpp
--	$(CXXLINK) libkhotkeys_shared_la_closure.lo $(libkhotkeys_shared_la_LDFLAGS) $(libkhotkeys_shared_la_OBJECTS) $(libkhotkeys_shared_la_LIBADD) $(LIBS)
--	@rm -f libkhotkeys_shared_la_closure.* libkhotkeys_shared.la.closure
--	@echo "timestamp" > libkhotkeys_shared.la.closure
--
--
- #>+ 3
- clean-metasources:
--	-rm -f  soundrecorder.moc voices.moc input.moc windows.moc khlistview.moc triggers.moc gestures.moc khlistbox.moc soundrecorder_arts.moc conditions.moc
-+	-rm -f  soundrecorder.moc voices.moc input.moc windows.moc khlistview.moc triggers.moc gestures.moc khlistbox.moc conditions.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in Makefile.am 
- 
- #>+ 3
- clean-closures:
--	-rm -f  khotkeys_shared_arts.la.closure libkhotkeys_shared.la.closure
-+	-rm -f  libkhotkeys_shared.la.closure
- 
- #>+ 2
- docs-am:
-@@ -1107,34 +1044,49 @@
- 	done
- 
- 
-+#>+ 11
-+libkhotkeys_shared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/action_data.cpp $(srcdir)/khotkeysglobal.cpp $(srcdir)/triggers.cpp $(srcdir)/windows.cpp $(srcdir)/settings.cpp $(srcdir)/actions.cpp $(srcdir)/input.cpp $(srcdir)/conditions.cpp $(srcdir)/khlistview.cpp $(srcdir)/khlistbox.cpp $(srcdir)/gestures.cpp $(srcdir)/voices.cpp $(srcdir)/voicesignature.cpp $(srcdir)/sound.cpp $(srcdir)/soundrecorder.cpp  soundrecorder.moc voices.moc input.moc windows.moc khlistview.moc triggers.moc gestures.moc khlistbox.moc conditions.moc
-+	@echo 'creating libkhotkeys_shared_la.all_cpp.cpp ...'; \
-+	rm -f libkhotkeys_shared_la.all_cpp.files libkhotkeys_shared_la.all_cpp.final; \
-+	echo "#define KDE_USE_FINAL 1" >> libkhotkeys_shared_la.all_cpp.final; \
-+	for file in action_data.cpp khotkeysglobal.cpp triggers.cpp windows.cpp settings.cpp actions.cpp input.cpp conditions.cpp khlistview.cpp khlistbox.cpp gestures.cpp voices.cpp voicesignature.cpp sound.cpp soundrecorder.cpp ; do \
-+	  echo "#include \"$$file\"" >> libkhotkeys_shared_la.all_cpp.files; \
-+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkhotkeys_shared_la.all_cpp.final; \
-+	done; \
-+	cat libkhotkeys_shared_la.all_cpp.final libkhotkeys_shared_la.all_cpp.files > libkhotkeys_shared_la.all_cpp.cpp; \
-+	rm -f libkhotkeys_shared_la.all_cpp.final libkhotkeys_shared_la.all_cpp.files
-+
-+#>+ 3
-+clean-final:
-+	-rm -f libkhotkeys_shared_la.all_cpp.cpp
-+
- #>+ 3
- final:
--	$(MAKE) all-am
-+	$(MAKE) libkhotkeys_shared_la_OBJECTS="$(libkhotkeys_shared_la_final_OBJECTS)" all-am
- 
- #>+ 3
- final-install:
--	$(MAKE) install-am
-+	$(MAKE) libkhotkeys_shared_la_OBJECTS="$(libkhotkeys_shared_la_final_OBJECTS)" install-am
- 
- #>+ 3
- no-final:
--	$(MAKE) all-am
-+	$(MAKE) libkhotkeys_shared_la_OBJECTS="$(libkhotkeys_shared_la_nofinal_OBJECTS)" all-am
- 
- #>+ 3
- no-final-install:
--	$(MAKE) install-am
-+	$(MAKE) libkhotkeys_shared_la_OBJECTS="$(libkhotkeys_shared_la_nofinal_OBJECTS)" install-am
- 
- #>+ 3
- kde-rpo-clean:
- 	-rm -f *.rpo
- 
--#>+ 23
-+#>+ 21
- triggers.lo: triggers.moc 
- gestures.lo: gestures.moc 
- khlistview.lo: khlistview.moc 
- voices.o: voices.moc 
- windows.o: windows.moc 
- soundrecorder.lo: soundrecorder.moc 
--soundrecorder_arts.lo: soundrecorder_arts.moc 
- conditions.o: conditions.moc 
- windows.lo: windows.moc 
- soundrecorder.o: soundrecorder.moc 
-@@ -1149,4 +1101,3 @@
- triggers.o: triggers.moc 
- khlistbox.o: khlistbox.moc 
- khlistview.o: khlistview.moc 
--soundrecorder_arts.o: soundrecorder_arts.moc 
---- khotkeys/update/Makefile.in
-+++ khotkeys/update/Makefile.in
-@@ -183,6 +183,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -285,6 +286,9 @@
+ mostlyclean-libtool:
+--- khotkeys/shared/Makefile.in
++++ khotkeys/shared/Makefile.in
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31575,16 +25311,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -435,6 +439,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -581,7 +587,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31593,7 +25320,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +625,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31603,19 +25330,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kconfPROGRAMS: $(kconf_PROGRAMS)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kicker/Makefile.in
-+++ kicker/Makefile.in
-@@ -165,6 +165,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -267,6 +268,9 @@
+--- khotkeys/update/Makefile.in
++++ khotkeys/update/Makefile.in
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31625,25 +25344,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -417,6 +421,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -557,7 +563,7 @@
- all: docs-am  all-recursive
+@@ -584,7 +587,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -622,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31653,19 +25363,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kicker/applets/Makefile.in
-+++ kicker/applets/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+ install-kconfPROGRAMS: $(kconf_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+--- kicker/applets/clock/Makefile.in
++++ kicker/applets/clock/Makefile.in
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31675,25 +25377,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
- all: docs-am  all-recursive
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31703,19 +25396,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kicker/applets/clock/Makefile.in
-+++ kicker/applets/clock/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kicker/applets/launcher/Makefile.in
++++ kicker/applets/launcher/Makefile.in
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31725,16 +25410,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -603,7 +609,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31743,7 +25419,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +647,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31755,17 +25431,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kicker/applets/launcher/Makefile.in
-+++ kicker/applets/launcher/Makefile.in
-@@ -208,6 +208,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -310,6 +311,9 @@
+--- kicker/applets/lockout/Makefile.in
++++ kicker/applets/lockout/Makefile.in
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31775,16 +25443,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,6 +464,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -616,7 +622,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31793,7 +25452,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -654,9 +660,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31805,17 +25464,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kicker/applets/lockout/Makefile.in
-+++ kicker/applets/lockout/Makefile.in
-@@ -193,6 +193,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -295,6 +296,9 @@
+--- kicker/applets/Makefile.in
++++ kicker/applets/Makefile.in
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31825,25 +25476,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,6 +449,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -595,7 +601,7 @@
+@@ -559,7 +562,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +639,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31853,19 +25495,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
+ 
+ mostlyclean-libtool:
 --- kicker/applets/media/Makefile.in
 +++ kicker/applets/media/Makefile.in
-@@ -200,6 +200,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -302,6 +303,9 @@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31875,16 +25509,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,6 +456,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -602,7 +608,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31893,7 +25518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +646,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31907,15 +25532,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/menu/Makefile.in
 +++ kicker/applets/menu/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31925,16 +25542,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -600,7 +606,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31943,7 +25551,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +644,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -31957,15 +25565,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/minipager/Makefile.in
 +++ kicker/applets/minipager/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31975,16 +25575,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -608,7 +614,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -31993,7 +25584,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +652,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32007,15 +25598,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/naughty/Makefile.in
 +++ kicker/applets/naughty/Makefile.in
-@@ -201,6 +201,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -303,6 +304,9 @@
+@@ -304,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32025,16 +25608,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -453,6 +457,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -613,7 +619,7 @@
+@@ -616,7 +619,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32043,7 +25617,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -651,9 +657,9 @@
+@@ -654,9 +657,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32057,15 +25631,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/run/Makefile.in
 +++ kicker/applets/run/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32075,16 +25641,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32093,7 +25650,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32107,15 +25664,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/swallow/Makefile.in
 +++ kicker/applets/swallow/Makefile.in
-@@ -198,6 +198,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -300,6 +301,9 @@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32125,16 +25674,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,6 +454,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32143,7 +25683,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32155,7 +25695,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -931,22 +937,22 @@
+@@ -934,22 +937,22 @@
  
  
  #>+ 3
@@ -32185,7 +25725,7 @@
  
  #>+ 2
  KDE_DIST=swallowapplet.desktop Makefile.in prefwidgetbase.ui Makefile.am 
-@@ -1002,7 +1008,7 @@
+@@ -1005,7 +1008,7 @@
  
  
  #>+ 11
@@ -32194,7 +25734,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; \
-@@ -1042,8 +1048,8 @@
+@@ -1045,8 +1048,8 @@
  swallow.o: swallow.moc 
  $(srcdir)/prefwidget.cpp: prefwidgetbase.h 
  nmcheck-am: nmcheck
@@ -32206,15 +25746,7 @@
  
 --- kicker/applets/systemtray/Makefile.in
 +++ kicker/applets/systemtray/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32224,16 +25756,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -603,7 +609,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32242,7 +25765,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +647,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32256,15 +25779,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/taskbar/Makefile.in
 +++ kicker/applets/taskbar/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32274,16 +25789,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32292,7 +25798,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32306,15 +25812,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/applets/trash/Makefile.in
 +++ kicker/applets/trash/Makefile.in
-@@ -198,6 +198,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -300,6 +301,9 @@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32324,16 +25822,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,6 +454,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -602,7 +608,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32342,7 +25831,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +646,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32354,17 +25843,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kicker/data/Makefile.in
-+++ kicker/data/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+--- kicker/data/app_start_anim/Makefile.in
++++ kicker/data/app_start_anim/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32374,17 +25855,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
- all: docs-am  all-recursive
+@@ -555,7 +558,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -32392,7 +25864,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32404,17 +25876,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kicker/data/app_start_anim/Makefile.in
-+++ kicker/data/app_start_anim/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- kicker/data/icons/actions/Makefile.in
++++ kicker/data/icons/actions/Makefile.in
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32424,16 +25888,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -32442,7 +25897,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32456,15 +25911,7 @@
  mostlyclean-libtool:
 --- kicker/data/icons/Makefile.in
 +++ kicker/data/icons/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32474,16 +25921,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -557,7 +563,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -32492,7 +25930,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32504,7 +25942,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -895,27 +901,27 @@
+@@ -898,27 +901,27 @@
  
  #>+ 23
  install-kde-icons:
@@ -32540,17 +25978,9 @@
  
  #>+ 15
  force-reedit:
---- kicker/data/icons/actions/Makefile.in
-+++ kicker/data/icons/actions/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+--- kicker/data/kmenu_side/Makefile.in
++++ kicker/data/kmenu_side/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32560,16 +25990,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -32578,7 +25999,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32590,17 +26011,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kicker/data/kmenu_side/Makefile.in
-+++ kicker/data/kmenu_side/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- kicker/data/Makefile.in
++++ kicker/data/Makefile.in
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32610,17 +26023,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
- all: docs-am  all-am
+@@ -559,7 +562,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -32628,7 +26032,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32642,15 +26046,7 @@
  mostlyclean-libtool:
 --- kicker/data/tiles/Makefile.in
 +++ kicker/data/tiles/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32660,16 +26056,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -603,7 +609,7 @@
+@@ -606,7 +609,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -32678,7 +26065,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +647,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32690,7 +26077,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -803,7 +809,7 @@
+@@ -806,7 +809,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -32701,15 +26088,7 @@
  docs-am:
 --- kicker/data/wallpaper/Makefile.in
 +++ kicker/data/wallpaper/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32719,16 +26098,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -32737,7 +26107,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32749,67 +26119,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kicker/extensions/Makefile.in
-+++ kicker/extensions/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- kicker/extensions/dockbar/Makefile.in
 +++ kicker/extensions/dockbar/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32819,16 +26131,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32837,7 +26140,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32851,15 +26154,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/extensions/kasbar/Makefile.in
 +++ kicker/extensions/kasbar/Makefile.in
-@@ -220,6 +220,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -322,6 +323,9 @@
+@@ -323,6 +323,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32869,16 +26164,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -472,6 +476,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -652,7 +658,7 @@
+@@ -655,7 +658,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -32887,7 +26173,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -690,9 +696,9 @@
+@@ -693,9 +696,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32899,7 +26185,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1099,6 +1105,13 @@
+@@ -1102,6 +1105,13 @@
  mocs: kasbarextension.moc
  
  #>+ 3
@@ -32913,7 +26199,7 @@
  kasclockitem.moc: $(srcdir)/kasclockitem.h
  	$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
  
-@@ -1113,13 +1126,6 @@
+@@ -1116,13 +1126,6 @@
  mocs: kasitem.moc
  
  #>+ 3
@@ -32927,7 +26213,7 @@
  kasresources.moc: $(srcdir)/kasresources.h
  	$(MOC) $(srcdir)/kasresources.h -o kasresources.moc
  
-@@ -1179,7 +1185,7 @@
+@@ -1182,7 +1185,7 @@
  
  #>+ 3
  clean-metasources:
@@ -32936,17 +26222,9 @@
  
  #>+ 2
  KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile configure.in.in docs.h kastaskpopup.h kasbarextension.desktop Makefile.am 
---- kicker/extensions/sidebar/Makefile.in
-+++ kicker/extensions/sidebar/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+--- kicker/extensions/Makefile.in
++++ kicker/extensions/Makefile.in
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32956,25 +26234,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -592,7 +598,7 @@
+@@ -559,7 +562,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +636,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -32984,19 +26253,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- kicker/extensions/taskbar/Makefile.in
-+++ kicker/extensions/taskbar/Makefile.in
-@@ -200,6 +200,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -302,6 +303,9 @@
+ 
+ mostlyclean-libtool:
+--- kicker/extensions/sidebar/Makefile.in
++++ kicker/extensions/sidebar/Makefile.in
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33006,16 +26267,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,6 +456,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -608,7 +614,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33024,7 +26276,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +652,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33036,17 +26288,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kicker/kicker/Makefile.in
-+++ kicker/kicker/Makefile.in
-@@ -243,6 +243,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -345,6 +346,9 @@
+--- kicker/extensions/taskbar/Makefile.in
++++ kicker/extensions/taskbar/Makefile.in
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33056,16 +26300,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -495,6 +499,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -659,7 +665,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33074,7 +26309,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -697,9 +703,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33084,19 +26319,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 --- kicker/kicker/buttons/Makefile.in
 +++ kicker/kicker/buttons/Makefile.in
-@@ -200,6 +200,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -302,6 +303,9 @@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33106,16 +26333,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,6 +456,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -609,7 +615,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33124,7 +26342,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +653,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33136,7 +26354,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -957,11 +963,11 @@
+@@ -960,11 +963,11 @@
  mocs: servicebutton.moc
  
  #>+ 3
@@ -33151,7 +26369,7 @@
  
  #>+ 3
  servicemenubutton.moc: $(srcdir)/servicemenubutton.h
-@@ -971,11 +977,11 @@
+@@ -974,11 +977,11 @@
  mocs: servicemenubutton.moc
  
  #>+ 3
@@ -33166,7 +26384,7 @@
  
  #>+ 3
  nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
-@@ -993,10 +999,10 @@
+@@ -996,10 +999,10 @@
  
  #>+ 3
  clean-metasources:
@@ -33179,7 +26397,7 @@
  
  #>+ 2
  docs-am:
-@@ -1040,7 +1046,7 @@
+@@ -1043,7 +1046,7 @@
  
  
  #>+ 11
@@ -33188,7 +26406,7 @@
  	@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; \
-@@ -1079,8 +1085,8 @@
+@@ -1082,8 +1085,8 @@
  extensionbutton.o: extensionbutton.moc 
  urlbutton.o: urlbutton.moc 
  nonkdeappbutton.lo: nonkdeappbutton.moc 
@@ -33200,15 +26418,7 @@
  kbutton.o: kbutton.moc 
 --- kicker/kicker/core/Makefile.in
 +++ kicker/kicker/core/Makefile.in
-@@ -205,6 +205,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -307,6 +308,9 @@
+@@ -308,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33218,16 +26428,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -457,6 +461,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -628,7 +634,7 @@
+@@ -631,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33236,7 +26437,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +672,9 @@
+@@ -669,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33248,7 +26449,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -982,18 +988,18 @@
+@@ -985,18 +988,18 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub panelextension.kidl
  
  #>+ 3
@@ -33273,7 +26474,7 @@
  
  #>+ 3
  container_applet.moc: $(srcdir)/container_applet.h
-@@ -1031,18 +1037,18 @@
+@@ -1034,18 +1037,18 @@
  mocs: pluginmanager.moc
  
  #>+ 3
@@ -33298,7 +26499,7 @@
  
  #>+ 3
  showdesktop.moc: $(srcdir)/showdesktop.h
-@@ -1059,18 +1065,18 @@
+@@ -1062,18 +1065,18 @@
  mocs: extensionmanager.moc
  
  #>+ 3
@@ -33323,7 +26524,7 @@
  
  #>+ 3
  userrectsel.moc: $(srcdir)/userrectsel.h
-@@ -1081,7 +1087,7 @@
+@@ -1084,7 +1087,7 @@
  
  #>+ 3
  clean-metasources:
@@ -33332,7 +26533,7 @@
  
  #>+ 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 
-@@ -1139,7 +1145,7 @@
+@@ -1142,7 +1145,7 @@
  
  
  #>+ 11
@@ -33341,17 +26542,42 @@
  	@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; \
+--- kicker/kicker/Makefile.in
++++ kicker/kicker/Makefile.in
+@@ -346,6 +346,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -662,7 +665,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -700,9 +703,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- kicker/kicker/ui/Makefile.in
 +++ kicker/kicker/ui/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33361,16 +26587,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -628,7 +634,7 @@
+@@ -631,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33379,7 +26596,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +672,9 @@
+@@ -669,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33391,7 +26608,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -950,11 +956,11 @@
+@@ -953,11 +956,11 @@
  	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub k_mnu.kidl
  
  #>+ 3
@@ -33406,7 +26623,7 @@
  
  #>+ 3
  exe_dlg.moc: $(srcdir)/exe_dlg.h
-@@ -964,11 +970,11 @@
+@@ -967,11 +970,11 @@
  mocs: exe_dlg.moc
  
  #>+ 3
@@ -33421,7 +26638,7 @@
  
  #>+ 3
  hidebutton.moc: $(srcdir)/hidebutton.h
-@@ -1062,18 +1068,18 @@
+@@ -1065,18 +1068,18 @@
  mocs: addappletvisualfeedback.moc
  
  #>+ 3
@@ -33446,7 +26663,7 @@
  
  #>+ 3
  addextension_mnu.moc: $(srcdir)/addextension_mnu.h
-@@ -1084,7 +1090,7 @@
+@@ -1087,7 +1090,7 @@
  
  #>+ 3
  clean-metasources:
@@ -33455,7 +26672,7 @@
  
  #>+ 2
  KDE_DIST=Makefile.in appletitem.ui nonKDEButtonSettings.ui panelmenuiteminfo.h appletview.ui Makefile.am 
-@@ -1143,7 +1149,7 @@
+@@ -1146,7 +1149,7 @@
  
  
  #>+ 11
@@ -33464,7 +26681,7 @@
  	@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; \
-@@ -1184,7 +1190,7 @@
+@@ -1187,7 +1190,7 @@
  addappletvisualfeedback.o: addappletvisualfeedback.moc 
  addextension_mnu.o: addextension_mnu.moc 
  browser_dlg.lo: browser_dlg.moc 
@@ -33473,7 +26690,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 
-@@ -1194,7 +1200,7 @@
+@@ -1197,7 +1200,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 
@@ -33484,15 +26701,7 @@
  $(srcdir)/removeapplet_mnu.cpp: appletitem.h appletview.h nonKDEButtonSettings.h 
 --- kicker/libkicker/Makefile.in
 +++ kicker/libkicker/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33502,16 +26711,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -609,7 +615,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33520,7 +26720,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +653,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33532,7 +26732,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -957,22 +963,22 @@
+@@ -960,22 +963,22 @@
  mocs: panelbutton.moc
  
  #>+ 3
@@ -33562,7 +26762,7 @@
  
  #>+ 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 
-@@ -1028,7 +1034,7 @@
+@@ -1031,7 +1034,7 @@
  
  
  #>+ 11
@@ -33571,7 +26771,7 @@
  	@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; \
-@@ -1082,8 +1088,8 @@
+@@ -1085,8 +1088,8 @@
  simplebutton.lo: simplebutton.moc 
  $(srcdir)/simplebutton.cpp: kickerSettings.h 
  $(srcdir)/paneldrag.cpp: kickerSettings.h 
@@ -33581,17 +26781,9 @@
  
  #>+ 6
  kickerSettings.cpp: kickerSettings.h
---- kicker/menuext/Makefile.in
-+++ kicker/menuext/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+--- kicker/Makefile.in
++++ kicker/Makefile.in
+@@ -268,6 +268,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33601,16 +26793,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -33619,7 +26802,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33633,15 +26816,7 @@
  mostlyclean-libtool:
 --- kicker/menuext/find/Makefile.in
 +++ kicker/menuext/find/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33651,16 +26826,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -594,7 +600,7 @@
+@@ -597,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33669,7 +26835,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +638,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33683,15 +26849,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/kdeprint/Makefile.in
 +++ kicker/menuext/kdeprint/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33701,16 +26859,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -592,7 +598,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33719,7 +26868,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +636,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33733,15 +26882,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/konq-profiles/Makefile.in
 +++ kicker/menuext/konq-profiles/Makefile.in
-@@ -193,6 +193,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -295,6 +296,9 @@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33751,16 +26892,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,6 +449,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -593,7 +599,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33769,7 +26901,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +637,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33783,15 +26915,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/konsole/Makefile.in
 +++ kicker/menuext/konsole/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33801,16 +26925,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -597,7 +603,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33819,7 +26934,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +641,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33831,17 +26946,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kicker/menuext/Makefile.in
++++ kicker/menuext/Makefile.in
+@@ -267,6 +267,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -559,7 +562,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -597,9 +600,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
 --- kicker/menuext/prefmenu/Makefile.in
 +++ kicker/menuext/prefmenu/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33851,16 +26991,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -592,7 +598,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33869,7 +27000,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +636,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33883,15 +27014,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/recentdocs/Makefile.in
 +++ kicker/menuext/recentdocs/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33901,16 +27024,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -592,7 +598,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33919,7 +27033,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +636,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33933,15 +27047,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/remote/Makefile.in
 +++ kicker/menuext/remote/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33951,16 +27057,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -598,7 +604,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -33969,7 +27066,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +642,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -33983,15 +27080,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/system/Makefile.in
 +++ kicker/menuext/system/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34001,16 +27090,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -592,7 +598,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34019,7 +27099,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +636,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34033,15 +27113,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/menuext/tom/Makefile.in
 +++ kicker/menuext/tom/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34051,16 +27123,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -595,7 +601,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -34069,7 +27132,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +639,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34083,15 +27146,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/proxy/Makefile.in
 +++ kicker/proxy/Makefile.in
-@@ -225,6 +225,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -327,6 +328,9 @@
+@@ -328,6 +328,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34101,16 +27156,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -477,6 +481,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -636,7 +642,7 @@
+@@ -639,7 +642,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34119,7 +27165,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -674,9 +680,9 @@
+@@ -677,9 +680,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34131,7 +27177,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1060,18 +1066,18 @@
+@@ -1063,18 +1066,18 @@
  extensionproxy_DEPENDENCIES = libkdeinit_extensionproxy.la
  
  #>+ 3
@@ -34156,7 +27202,7 @@
  
  #>+ 3
  extensiondebugger.moc: $(srcdir)/extensiondebugger.h
-@@ -1082,7 +1088,7 @@
+@@ -1085,7 +1088,7 @@
  
  #>+ 3
  clean-metasources:
@@ -34167,15 +27213,7 @@
  KDE_DIST=Makefile.in appletproxy.h extensiondebugger.h extensionproxy.h Makefile.am 
 --- kicker/taskbar/Makefile.in
 +++ kicker/taskbar/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34185,16 +27223,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -605,7 +611,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34203,7 +27232,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +649,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34217,15 +27246,7 @@
  	@$(NORMAL_INSTALL)
 --- kicker/taskmanager/Makefile.in
 +++ kicker/taskmanager/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34235,16 +27256,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -594,7 +600,7 @@
+@@ -597,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34253,7 +27265,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +638,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34265,67 +27277,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/Makefile.in
-+++ kioslave/Makefile.in
-@@ -166,6 +166,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -268,6 +269,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -418,6 +422,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -563,7 +569,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -601,9 +607,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- kioslave/about/Makefile.in
 +++ kioslave/about/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34335,16 +27289,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -598,7 +604,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34353,7 +27298,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +642,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34365,17 +27310,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/cgi/Makefile.in
-+++ kioslave/cgi/Makefile.in
-@@ -208,6 +208,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -310,6 +311,9 @@
+--- kioslave/cgi/kcmcgi/Makefile.in
++++ kioslave/cgi/kcmcgi/Makefile.in
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34385,16 +27322,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,6 +464,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -610,7 +616,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34403,7 +27331,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +654,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34415,17 +27343,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/cgi/kcmcgi/Makefile.in
-+++ kioslave/cgi/kcmcgi/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+--- kioslave/cgi/Makefile.in
++++ kioslave/cgi/Makefile.in
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34435,16 +27355,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34453,7 +27364,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34467,15 +27378,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/filter/Makefile.in
 +++ kioslave/filter/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34485,16 +27388,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -597,7 +603,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -34503,7 +27397,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +641,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34517,15 +27411,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/finger/Makefile.in
 +++ kioslave/finger/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34535,16 +27421,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34553,7 +27430,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34567,15 +27444,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/fish/Makefile.in
 +++ kioslave/fish/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34585,16 +27454,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -598,7 +604,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34603,7 +27463,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +642,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34617,15 +27477,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/floppy/Makefile.in
 +++ kioslave/floppy/Makefile.in
-@@ -195,6 +195,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -297,6 +298,9 @@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34635,16 +27487,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,6 +451,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -598,7 +604,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34653,7 +27496,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +642,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34665,17 +27508,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/home/Makefile.in
-+++ kioslave/home/Makefile.in
-@@ -221,6 +221,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -323,6 +324,9 @@
+--- kioslave/home/kdedmodule/Makefile.in
++++ kioslave/home/kdedmodule/Makefile.in
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34685,16 +27520,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,6 +477,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -629,7 +635,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34703,7 +27529,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -667,9 +673,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34715,17 +27541,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/home/kdedmodule/Makefile.in
-+++ kioslave/home/kdedmodule/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+--- kioslave/home/Makefile.in
++++ kioslave/home/Makefile.in
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34735,16 +27553,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -598,7 +604,7 @@
+@@ -632,7 +635,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34753,7 +27562,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +642,9 @@
+@@ -670,9 +673,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34767,15 +27576,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/info/Makefile.in
 +++ kioslave/info/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34785,16 +27586,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -605,7 +611,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -34803,7 +27595,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +649,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34817,15 +27609,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/ldap/Makefile.in
 +++ kioslave/ldap/Makefile.in
-@@ -195,6 +195,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -297,6 +298,9 @@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34835,16 +27619,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,6 +451,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -600,7 +606,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34853,7 +27628,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +644,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34867,15 +27642,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/mac/Makefile.in
 +++ kioslave/mac/Makefile.in
-@@ -193,6 +193,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -295,6 +296,9 @@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34885,16 +27652,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,6 +449,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -598,7 +604,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -34903,7 +27661,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +642,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34915,7 +27673,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -952,14 +958,14 @@
+@@ -955,14 +958,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -34933,17 +27691,9 @@
  
  #>+ 15
  force-reedit:
---- kioslave/man/Makefile.in
-+++ kioslave/man/Makefile.in
-@@ -218,6 +218,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -320,6 +321,9 @@
+--- kioslave/Makefile.in
++++ kioslave/Makefile.in
+@@ -269,6 +269,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34953,25 +27703,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -470,6 +474,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -637,7 +643,7 @@
+@@ -566,7 +569,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -675,9 +681,9 @@
+@@ -604,9 +607,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -34981,19 +27722,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- kioslave/media/Makefile.in
-+++ kioslave/media/Makefile.in
-@@ -222,6 +222,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -324,6 +325,9 @@
+ 
+ mostlyclean-libtool:
+--- kioslave/man/Makefile.in
++++ kioslave/man/Makefile.in
+@@ -321,6 +321,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35003,16 +27736,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -474,6 +478,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -633,7 +639,7 @@
+@@ -640,7 +643,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35021,7 +27745,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -671,9 +677,9 @@
+@@ -678,9 +681,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35035,15 +27759,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/kcmodule/Makefile.in
 +++ kioslave/media/kcmodule/Makefile.in
-@@ -200,6 +200,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -302,6 +303,9 @@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35053,16 +27769,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,6 +456,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -614,7 +620,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35071,7 +27778,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +658,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35085,15 +27792,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/kfile-plugin/Makefile.in
 +++ kioslave/media/kfile-plugin/Makefile.in
-@@ -195,6 +195,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -297,6 +298,9 @@
+@@ -298,6 +298,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35103,16 +27802,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -447,6 +451,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35121,7 +27811,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35135,15 +27825,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/libmediacommon/Makefile.in
 +++ kioslave/media/libmediacommon/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35153,16 +27835,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -603,7 +609,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35171,7 +27844,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +647,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35183,17 +27856,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
+--- kioslave/media/Makefile.in
++++ kioslave/media/Makefile.in
+@@ -325,6 +325,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -636,7 +639,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -674,9 +677,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- kioslave/media/mediamanager/Makefile.in
 +++ kioslave/media/mediamanager/Makefile.in
-@@ -231,6 +231,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -333,6 +334,9 @@
+@@ -334,6 +334,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35203,16 +27901,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -483,6 +487,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -642,7 +648,7 @@
+@@ -645,7 +648,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35221,7 +27910,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -680,9 +686,9 @@
+@@ -683,9 +686,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35233,7 +27922,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1032,7 +1038,7 @@
+@@ -1035,7 +1038,7 @@
  	-rm -f  removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
  
  #>+ 2
@@ -35244,15 +27933,7 @@
  clean-idl:
 --- kioslave/media/medianotifier/Makefile.in
 +++ kioslave/media/medianotifier/Makefile.in
-@@ -201,6 +201,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -303,6 +304,9 @@
+@@ -304,6 +304,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35262,16 +27943,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -453,6 +457,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -609,7 +615,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35280,7 +27952,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +653,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35294,15 +27966,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/mimetypes/Makefile.in
 +++ kioslave/media/mimetypes/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35312,16 +27976,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -569,7 +575,7 @@
+@@ -572,7 +575,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35330,7 +27985,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +613,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35344,15 +27999,7 @@
  mostlyclean-libtool:
 --- kioslave/media/mounthelper/Makefile.in
 +++ kioslave/media/mounthelper/Makefile.in
-@@ -183,6 +183,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -285,6 +286,9 @@
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35362,16 +28009,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -435,6 +439,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -581,7 +587,7 @@
+@@ -584,7 +587,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35380,7 +28018,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +625,9 @@
+@@ -622,9 +625,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35394,15 +28032,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/media/services/Makefile.in
 +++ kioslave/media/services/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35412,16 +28042,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -35430,7 +28051,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35444,15 +28065,7 @@
  mostlyclean-libtool:
 --- kioslave/nfs/Makefile.in
 +++ kioslave/nfs/Makefile.in
-@@ -205,6 +205,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -307,6 +308,9 @@
+@@ -308,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35462,16 +28075,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -457,6 +461,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -609,7 +615,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -35480,7 +28084,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +653,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35494,15 +28098,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/nntp/Makefile.in
 +++ kioslave/nntp/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35512,16 +28108,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -597,7 +603,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35530,7 +28117,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -635,9 +641,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35544,15 +28131,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/pop3/Makefile.in
 +++ kioslave/pop3/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35562,16 +28141,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -35580,7 +28150,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35592,17 +28162,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/remote/Makefile.in
-+++ kioslave/remote/Makefile.in
-@@ -221,6 +221,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -323,6 +324,9 @@
+--- kioslave/remote/kdedmodule/Makefile.in
++++ kioslave/remote/kdedmodule/Makefile.in
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35612,16 +28174,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,6 +477,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -629,7 +635,7 @@
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35630,7 +28183,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -667,9 +673,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35642,17 +28195,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/remote/kdedmodule/Makefile.in
-+++ kioslave/remote/kdedmodule/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+--- kioslave/remote/Makefile.in
++++ kioslave/remote/Makefile.in
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35662,16 +28207,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -599,7 +605,7 @@
+@@ -632,7 +635,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35680,7 +28216,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +643,9 @@
+@@ -670,9 +673,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35694,15 +28230,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/settings/Makefile.in
 +++ kioslave/settings/Makefile.in
-@@ -208,6 +208,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -310,6 +311,9 @@
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35712,16 +28240,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,6 +464,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -611,7 +617,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -35730,7 +28249,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +655,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35744,15 +28263,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/sftp/Makefile.in
 +++ kioslave/sftp/Makefile.in
-@@ -206,6 +206,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -308,6 +309,9 @@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35762,16 +28273,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -458,6 +462,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -610,7 +616,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35780,7 +28282,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +654,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35794,15 +28296,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/smb/Makefile.in
 +++ kioslave/smb/Makefile.in
-@@ -205,6 +205,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -307,6 +308,9 @@
+@@ -308,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35812,16 +28306,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -457,6 +461,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -622,7 +628,7 @@
+@@ -625,7 +628,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -35830,7 +28315,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -660,9 +666,9 @@
+@@ -663,9 +666,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35844,15 +28329,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/smtp/Makefile.in
 +++ kioslave/smtp/Makefile.in
-@@ -227,6 +227,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -329,6 +330,9 @@
+@@ -330,6 +330,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35862,16 +28339,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,6 +483,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -641,7 +647,7 @@
+@@ -644,7 +647,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -35880,7 +28348,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -679,9 +685,9 @@
+@@ -682,9 +685,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35892,17 +28360,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/system/Makefile.in
-+++ kioslave/system/Makefile.in
-@@ -221,6 +221,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -323,6 +324,9 @@
+--- kioslave/system/entries/Makefile.in
++++ kioslave/system/entries/Makefile.in
+@@ -264,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35912,25 +28372,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -473,6 +477,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -628,7 +634,7 @@
+@@ -558,7 +561,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -666,9 +672,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35940,19 +28391,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
---- kioslave/system/entries/Makefile.in
-+++ kioslave/system/entries/Makefile.in
-@@ -161,6 +161,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -263,6 +264,9 @@
+--- kioslave/system/kdedmodule/Makefile.in
++++ kioslave/system/kdedmodule/Makefile.in
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35962,25 +28405,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -413,6 +417,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
- all: docs-am  all-am
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -35990,19 +28424,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binSCRIPTS: $(bin_SCRIPTS)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/system/kdedmodule/Makefile.in
-+++ kioslave/system/kdedmodule/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+--- kioslave/system/Makefile.in
++++ kioslave/system/Makefile.in
+@@ -324,6 +324,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36012,16 +28438,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -599,7 +605,7 @@
+@@ -631,7 +634,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36030,7 +28447,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +643,9 @@
+@@ -669,9 +672,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36044,15 +28461,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/system/mimetypes/Makefile.in
 +++ kioslave/system/mimetypes/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36062,16 +28471,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -36080,7 +28480,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36094,15 +28494,7 @@
  mostlyclean-libtool:
 --- kioslave/tar/Makefile.in
 +++ kioslave/tar/Makefile.in
-@@ -200,6 +200,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -302,6 +303,9 @@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36112,16 +28504,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,6 +456,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -604,7 +610,7 @@
+@@ -607,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -36130,7 +28513,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +648,9 @@
+@@ -645,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36144,15 +28527,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/thumbnail/Makefile.in
 +++ kioslave/thumbnail/Makefile.in
-@@ -239,6 +239,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -341,6 +342,9 @@
+@@ -342,6 +342,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36162,16 +28537,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -491,6 +495,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -678,7 +684,7 @@
+@@ -681,7 +684,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36180,7 +28546,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -716,9 +722,9 @@
+@@ -719,9 +722,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36192,17 +28558,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/trash/Makefile.in
-+++ kioslave/trash/Makefile.in
-@@ -227,6 +227,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -329,6 +330,9 @@
+--- kioslave/trash/kfile-plugin/Makefile.in
++++ kioslave/trash/kfile-plugin/Makefile.in
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36212,16 +28570,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -479,6 +483,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -638,7 +644,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36230,7 +28579,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -676,9 +682,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36242,17 +28591,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kioslave/trash/kfile-plugin/Makefile.in
-+++ kioslave/trash/kfile-plugin/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+--- kioslave/trash/Makefile.in
++++ kioslave/trash/Makefile.in
+@@ -330,6 +330,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36262,16 +28603,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -592,7 +598,7 @@
+@@ -641,7 +644,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36280,7 +28612,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +636,9 @@
+@@ -679,9 +682,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36294,15 +28626,7 @@
  	@$(NORMAL_INSTALL)
 --- klipper/Makefile.in
 +++ klipper/Makefile.in
-@@ -245,6 +245,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -347,6 +348,9 @@
+@@ -348,6 +348,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36312,16 +28636,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,6 +501,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -677,7 +683,7 @@
+@@ -680,7 +683,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36330,7 +28645,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -715,9 +721,9 @@
+@@ -718,9 +721,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36342,7 +28657,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1251,18 +1257,18 @@
+@@ -1254,18 +1257,18 @@
  mocs: history.moc
  
  #>+ 3
@@ -36367,7 +28682,7 @@
  
  #>+ 3
  clipboardpoll.moc: $(srcdir)/clipboardpoll.h
-@@ -1301,7 +1307,7 @@
+@@ -1304,7 +1307,7 @@
  
  #>+ 3
  clean-metasources:
@@ -36376,7 +28691,7 @@
  
  #>+ 2
  KDE_DIST=popupproxy.h klipperbindings.cpp Makefile.in hisc-app-klipper.svgz historystringitem.h hi32-app-klipper.png urlgrabber.h klipperrc.upd 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 
-@@ -1317,29 +1323,29 @@
+@@ -1320,29 +1323,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -36415,7 +28730,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1392,7 +1398,7 @@
+@@ -1395,7 +1398,7 @@
  	rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
  
  #>+ 11
@@ -36426,15 +28741,7 @@
  	echo "#define KDE_USE_FINAL 1" >> libklipper_common_la.all_cpp.final; \
 --- kmenuedit/Makefile.in
 +++ kmenuedit/Makefile.in
-@@ -252,6 +252,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -354,6 +355,9 @@
+@@ -355,6 +355,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36444,16 +28751,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -504,6 +508,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -678,7 +684,7 @@
+@@ -681,7 +684,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36462,7 +28760,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -716,9 +722,9 @@
+@@ -719,9 +722,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36474,7 +28772,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1311,20 +1317,20 @@
+@@ -1314,20 +1317,20 @@
  
  #>+ 16
  install-kde-icons:
@@ -36503,15 +28801,7 @@
  force-reedit:
 --- kmenuedit/pixmaps/Makefile.in
 +++ kmenuedit/pixmaps/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36521,16 +28811,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -543,7 +549,7 @@
+@@ -546,7 +549,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -36539,7 +28820,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +587,9 @@
+@@ -584,9 +587,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36551,7 +28832,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -733,34 +739,34 @@
+@@ -736,34 +739,34 @@
  
  #>+ 30
  install-kde-icons:
@@ -36604,15 +28885,7 @@
  force-reedit:
 --- knetattach/Makefile.in
 +++ knetattach/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36622,16 +28895,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -595,7 +601,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -36640,7 +28904,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +639,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36652,7 +28916,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -914,7 +920,7 @@
+@@ -917,7 +920,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -36661,7 +28925,7 @@
  
  #>+ 4
  clean-ui:
-@@ -926,29 +932,29 @@
+@@ -929,29 +932,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -36703,132 +28967,9 @@
  
  #>+ 15
  force-reedit:
---- konqueror/Makefile.in
-+++ konqueror/Makefile.in
-@@ -261,6 +261,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -363,6 +364,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -513,6 +517,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -729,7 +735,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -767,9 +773,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -1481,6 +1487,13 @@
- mocs: konq_frame.moc
- 
- #>+ 3
-+konq_tabs.moc: $(srcdir)/konq_tabs.h
-+	$(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
-+
-+#>+ 2
-+mocs: konq_tabs.moc
-+
-+#>+ 3
- konq_misc.moc: $(srcdir)/konq_misc.h
- 	$(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
- 
-@@ -1495,11 +1508,11 @@
- mocs: konq_browseriface.moc
- 
- #>+ 3
--konq_tabs.moc: $(srcdir)/konq_tabs.h
--	$(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
-+konq_view.moc: $(srcdir)/konq_view.h
-+	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
- 
- #>+ 2
--mocs: konq_tabs.moc
-+mocs: konq_view.moc
- 
- #>+ 3
- konq_run.moc: $(srcdir)/konq_run.h
-@@ -1509,13 +1522,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
- 
-@@ -1554,10 +1560,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_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 
-+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:
-@@ -1617,7 +1623,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_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; \
 --- konqueror/about/Makefile.in
 +++ konqueror/about/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36838,16 +28979,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -602,7 +608,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -36856,7 +28988,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +646,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36870,15 +29002,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/client/Makefile.in
 +++ konqueror/client/Makefile.in
-@@ -214,6 +214,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -316,6 +317,9 @@
+@@ -317,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36888,16 +29012,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -466,6 +470,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -627,7 +633,7 @@
+@@ -630,7 +633,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -36906,7 +29021,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -665,9 +671,9 @@
+@@ -668,9 +671,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36920,15 +29035,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/iconview/Makefile.in
 +++ konqueror/iconview/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36938,16 +29045,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -36956,7 +29054,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -36970,15 +29068,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/keditbookmarks/Makefile.in
 +++ konqueror/keditbookmarks/Makefile.in
-@@ -217,6 +217,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -319,6 +320,9 @@
+@@ -320,6 +320,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36988,16 +29078,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -469,6 +473,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -635,7 +641,7 @@
+@@ -638,7 +641,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37006,7 +29087,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -673,9 +679,9 @@
+@@ -676,9 +679,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37018,7 +29099,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1128,18 +1134,18 @@
+@@ -1131,18 +1134,18 @@
  mocs: updater.moc
  
  #>+ 3
@@ -37043,7 +29124,7 @@
  
  #>+ 3
  bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
-@@ -1149,11 +1155,11 @@
+@@ -1152,11 +1155,11 @@
  mocs: bookmarkinfo.moc
  
  #>+ 3
@@ -37058,7 +29139,7 @@
  
  #>+ 3
  dcop.moc: $(srcdir)/dcop.h
-@@ -1163,18 +1169,18 @@
+@@ -1166,18 +1169,18 @@
  mocs: dcop.moc
  
  #>+ 3
@@ -37082,7 +29163,7 @@
  
  #>+ 5
  clean-idl:
-@@ -1192,20 +1198,20 @@
+@@ -1195,20 +1198,20 @@
  
  #>+ 16
  install-kde-icons:
@@ -37109,7 +29190,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1246,7 +1252,7 @@
+@@ -1249,7 +1252,7 @@
  
  
  #>+ 11
@@ -37120,15 +29201,7 @@
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
 --- konqueror/kttsplugin/Makefile.in
 +++ konqueror/kttsplugin/Makefile.in
-@@ -191,6 +191,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -293,6 +294,9 @@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37138,16 +29211,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,6 +447,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -593,7 +599,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37156,7 +29220,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +637,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37170,15 +29234,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/listview/Makefile.in
 +++ konqueror/listview/Makefile.in
-@@ -204,6 +204,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -306,6 +307,9 @@
+@@ -307,6 +307,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37188,16 +29244,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -456,6 +460,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -623,7 +629,7 @@
+@@ -626,7 +629,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -37206,7 +29253,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -661,9 +667,9 @@
+@@ -664,9 +667,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37218,17 +29265,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- konqueror/pics/Makefile.in
-+++ konqueror/pics/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+--- konqueror/Makefile.in
++++ konqueror/Makefile.in
+@@ -364,6 +364,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37238,25 +29277,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -557,7 +563,7 @@
- all: docs-am  all-recursive
+@@ -732,7 +735,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -770,9 +773,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37266,78 +29296,76 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -1484,6 +1487,13 @@
+ mocs: konq_frame.moc
  
- mostlyclean-libtool:
-@@ -895,39 +901,39 @@
+ #>+ 3
++konq_tabs.moc: $(srcdir)/konq_tabs.h
++	$(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
++
++#>+ 2
++mocs: konq_tabs.moc
++
++#>+ 3
+ konq_misc.moc: $(srcdir)/konq_misc.h
+ 	$(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
  
- #>+ 35
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
--	$(INSTALL_DATA) $(srcdir)/hisc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
--	$(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
-+	$(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/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
--	$(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
+@@ -1498,11 +1508,11 @@
+ mocs: konq_browseriface.moc
  
- 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/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/48x48/apps/konqueror.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
+ #>+ 3
+-konq_tabs.moc: $(srcdir)/konq_tabs.h
+-	$(MOC) $(srcdir)/konq_tabs.h -o konq_tabs.moc
++konq_view.moc: $(srcdir)/konq_view.h
++	$(MOC) $(srcdir)/konq_view.h -o konq_view.moc
  
- #>+ 15
- force-reedit:
+ #>+ 2
+-mocs: konq_tabs.moc
++mocs: konq_view.moc
+ 
+ #>+ 3
+ konq_run.moc: $(srcdir)/konq_run.h
+@@ -1512,13 +1522,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 +1560,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_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 
++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 +1623,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_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; \
 --- konqueror/pics/actions/Makefile.in
 +++ konqueror/pics/actions/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37347,16 +29375,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -37365,7 +29384,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37377,7 +29396,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,20 +738,20 @@
+@@ -735,20 +738,20 @@
  #>+ 17
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(konqiconsdir)/crystalsvg/16x16/actions
@@ -37404,15 +29423,7 @@
  force-reedit:
 --- konqueror/pics/indicators/Makefile.in
 +++ konqueror/pics/indicators/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37422,16 +29433,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -553,7 +559,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -37440,7 +29442,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +597,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37452,17 +29454,101 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+--- konqueror/pics/Makefile.in
++++ konqueror/pics/Makefile.in
+@@ -267,6 +267,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -560,7 +563,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -598,9 +601,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -898,39 +901,39 @@
+ 
+ #>+ 35
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/hisc-app-konqueror.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
+-	$(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
++	$(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/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
+-	$(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/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/48x48/apps/konqueror.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/konqueror.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfm.png
+ 
+ #>+ 15
+ force-reedit:
 --- konqueror/pics/tiles/Makefile.in
 +++ konqueror/pics/tiles/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37472,16 +29558,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -553,7 +559,7 @@
+@@ -556,7 +559,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -37490,7 +29567,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -591,9 +597,9 @@
+@@ -594,9 +597,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37504,15 +29581,7 @@
  mostlyclean-libtool:
 --- konqueror/preloader/Makefile.in
 +++ konqueror/preloader/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37522,16 +29591,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -603,7 +609,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -37540,7 +29600,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +647,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37554,15 +29614,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/quickprint/Makefile.in
 +++ konqueror/quickprint/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37572,16 +29624,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -557,7 +563,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -37590,7 +29633,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37602,7 +29645,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -757,7 +763,7 @@
+@@ -760,7 +763,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -37613,15 +29656,7 @@
  docs-am:
 --- konqueror/remoteencodingplugin/Makefile.in
 +++ konqueror/remoteencodingplugin/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37631,16 +29666,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -594,7 +600,7 @@
+@@ -597,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37649,7 +29675,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +638,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37663,15 +29689,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/shellcmdplugin/Makefile.in
 +++ konqueror/shellcmdplugin/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37681,16 +29699,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -601,7 +607,7 @@
+@@ -604,7 +607,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37699,7 +29708,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +645,9 @@
+@@ -642,9 +645,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37713,15 +29722,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/Makefile.in
 +++ konqueror/sidebar/Makefile.in
-@@ -236,6 +236,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -338,6 +339,9 @@
+@@ -339,6 +339,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37731,16 +29732,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -488,6 +492,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -666,7 +672,7 @@
+@@ -669,7 +672,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37749,7 +29741,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -704,9 +710,9 @@
+@@ -707,9 +710,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37763,15 +29755,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/test/Makefile.in
 +++ konqueror/sidebar/test/Makefile.in
-@@ -209,6 +209,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -311,6 +312,9 @@
+@@ -312,6 +312,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37781,16 +29765,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -461,6 +465,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -624,7 +630,7 @@
+@@ -627,7 +630,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37799,7 +29774,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -662,9 +668,9 @@
+@@ -665,9 +668,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37811,67 +29786,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- konqueror/sidebar/trees/Makefile.in
-+++ konqueror/sidebar/trees/Makefile.in
-@@ -215,6 +215,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -317,6 +318,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -467,6 +471,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -622,7 +628,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -660,9 +666,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/bookmark_module/Makefile.in
 +++ konqueror/sidebar/trees/bookmark_module/Makefile.in
-@@ -193,6 +193,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -295,6 +296,9 @@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37881,16 +29798,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,6 +449,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -591,7 +597,7 @@
+@@ -594,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37899,7 +29807,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +635,9 @@
+@@ -632,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37913,15 +29821,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/dirtree_module/Makefile.in
 +++ konqueror/sidebar/trees/dirtree_module/Makefile.in
-@@ -193,6 +193,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -295,6 +296,9 @@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37931,16 +29831,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,6 +449,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -593,7 +599,7 @@
+@@ -596,7 +599,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37949,7 +29840,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +637,9 @@
+@@ -634,9 +637,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37963,15 +29854,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/history_module/Makefile.in
 +++ konqueror/sidebar/trees/history_module/Makefile.in
-@@ -207,6 +207,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -309,6 +310,9 @@
+@@ -310,6 +310,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37981,16 +29864,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -459,6 +463,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -618,7 +624,7 @@
+@@ -621,7 +624,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -37999,7 +29873,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -656,9 +662,9 @@
+@@ -659,9 +662,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38013,15 +29887,7 @@
  	@$(NORMAL_INSTALL)
 --- konqueror/sidebar/trees/init/Makefile.in
 +++ konqueror/sidebar/trees/init/Makefile.in
-@@ -181,6 +181,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -283,6 +284,9 @@
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38031,16 +29897,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,6 +437,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -585,7 +591,7 @@
+@@ -588,7 +591,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -38049,7 +29906,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -623,9 +629,9 @@
+@@ -626,9 +629,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38061,17 +29918,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- konqueror/sidebar/trees/init/remote/Makefile.in
-+++ konqueror/sidebar/trees/init/remote/Makefile.in
-@@ -174,6 +174,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -276,6 +277,9 @@
+--- konqueror/sidebar/trees/init/remote/ftp/Makefile.in
++++ konqueror/sidebar/trees/init/remote/ftp/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38081,17 +29930,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,6 +430,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -568,7 +574,7 @@
- all: docs-am  all-recursive
+@@ -554,7 +557,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -38099,7 +29939,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -606,9 +612,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38111,17 +29951,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- konqueror/sidebar/trees/init/remote/ftp/Makefile.in
-+++ konqueror/sidebar/trees/init/remote/ftp/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- konqueror/sidebar/trees/init/remote/Makefile.in
++++ konqueror/sidebar/trees/init/remote/Makefile.in
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38131,17 +29963,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
- all: docs-am  all-am
+@@ -571,7 +574,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -38149,7 +29972,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38163,15 +29986,7 @@
  mostlyclean-libtool:
 --- konqueror/sidebar/trees/init/remote/web/Makefile.in
 +++ konqueror/sidebar/trees/init/remote/web/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38181,16 +29996,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -38199,7 +30005,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38213,15 +30019,7 @@
  mostlyclean-libtool:
 --- konqueror/sidebar/trees/init/services/Makefile.in
 +++ konqueror/sidebar/trees/init/services/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38231,16 +30029,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -38249,7 +30038,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38261,17 +30050,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- konqueror/sidebar/web_module/Makefile.in
-+++ konqueror/sidebar/web_module/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+--- konqueror/sidebar/trees/Makefile.in
++++ konqueror/sidebar/trees/Makefile.in
+@@ -318,6 +318,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38281,16 +30062,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -599,7 +605,7 @@
+@@ -625,7 +628,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38299,7 +30071,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +643,9 @@
+@@ -663,9 +666,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38311,17 +30083,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- konsole/Makefile.in
-+++ konsole/Makefile.in
-@@ -191,6 +191,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -293,6 +294,9 @@
+--- konqueror/sidebar/web_module/Makefile.in
++++ konqueror/sidebar/web_module/Makefile.in
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38331,25 +30095,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,6 +447,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -598,7 +604,7 @@
- all: docs-am  all-recursive
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -636,9 +642,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38359,19 +30114,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-updateSCRIPTS: $(update_SCRIPTS)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 --- konsole/doc/Makefile.in
 +++ konsole/doc/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38381,16 +30128,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -557,7 +563,7 @@
+@@ -560,7 +563,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -38399,7 +30137,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -595,9 +601,9 @@
+@@ -598,9 +601,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38413,15 +30151,7 @@
  mostlyclean-libtool:
 --- konsole/doc/VT100/Makefile.in
 +++ konsole/doc/VT100/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38431,16 +30161,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -543,7 +549,7 @@
+@@ -546,7 +549,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -38449,7 +30170,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -581,9 +587,9 @@
+@@ -584,9 +587,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38463,15 +30184,7 @@
  mostlyclean-libtool:
 --- konsole/fonts/Makefile.in
 +++ konsole/fonts/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38481,16 +30194,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -38499,7 +30203,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38513,15 +30217,7 @@
  mostlyclean-libtool:
 --- konsole/konsole/Makefile.in
 +++ konsole/konsole/Makefile.in
-@@ -254,6 +254,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -356,6 +357,9 @@
+@@ -357,6 +357,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38531,16 +30227,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -506,6 +510,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -725,7 +731,7 @@
+@@ -728,7 +731,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38549,7 +30236,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -763,9 +769,9 @@
+@@ -766,9 +769,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38561,7 +30248,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1241,18 +1247,18 @@
+@@ -1244,18 +1247,18 @@
  mocs: TEWidget.moc
  
  #>+ 3
@@ -38586,7 +30273,7 @@
  
  #>+ 3
  konsole.moc: $(srcdir)/konsole.h
-@@ -1297,18 +1303,18 @@
+@@ -1300,18 +1303,18 @@
  mocs: konsole_part.moc
  
  #>+ 3
@@ -38611,7 +30298,7 @@
  
  #>+ 5
  kwrited.kidl: $(srcdir)/kwrited.h $(DCOP_DEPENDENCIES)
-@@ -1327,7 +1333,7 @@
+@@ -1330,7 +1333,7 @@
  
  #>+ 3
  clean-metasources:
@@ -38620,7 +30307,7 @@
  
  #>+ 2
  KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults Makefile.in konsole_part.h konsoleiface.h linefont.src Makefile.am 
-@@ -1387,7 +1393,7 @@
+@@ -1390,7 +1393,7 @@
  
  
  #>+ 11
@@ -38629,7 +30316,7 @@
  	@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; \
-@@ -1465,8 +1471,8 @@
+@@ -1468,8 +1471,8 @@
  	@rm -f konsole$(EXEEXT)
  	$(CXXLINK) $(konsole_LDFLAGS) $(konsole_OBJECTS) $(konsole_LDADD) $(LIBS)
  
@@ -38639,17 +30326,9 @@
  konsole_part.o: konsole_part.moc 
  konsolebookmarkhandler.o: konsolebookmarkhandler.moc 
  nmcheck-am: nmcheck
---- konsole/other/Makefile.in
-+++ konsole/other/Makefile.in
-@@ -176,6 +176,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -278,6 +279,9 @@
+--- konsole/Makefile.in
++++ konsole/Makefile.in
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38659,16 +30338,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -428,6 +432,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -584,7 +590,7 @@
+@@ -601,7 +604,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -38677,7 +30347,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -622,9 +628,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38687,61 +30357,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
-@@ -963,29 +969,29 @@
- 
- #>+ 25
- install-kde-icons:
--	$(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/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/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/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/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/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/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/48x48/apps/konsole.png
- 
- #>+ 15
- force-reedit:
+ install-updateSCRIPTS: $(update_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
 --- konsole/other/icons/Makefile.in
 +++ konsole/other/icons/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38751,16 +30371,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -541,7 +547,7 @@
+@@ -544,7 +547,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -38769,7 +30380,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +585,9 @@
+@@ -582,9 +585,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38781,7 +30392,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -724,7 +730,7 @@
+@@ -727,7 +730,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -38790,7 +30401,7 @@
  
  #>+ 2
  docs-am:
-@@ -732,37 +738,37 @@
+@@ -735,37 +738,37 @@
  #>+ 35
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(konsoleiconsdir)/crystalsvg/22x22/actions
@@ -38845,17 +30456,84 @@
  	-rm -f $(DESTDIR)$(konsoleiconsdir)/crystalsvg/16x16/actions/konsolered.png
  
  #>+ 15
+--- konsole/other/Makefile.in
++++ konsole/other/Makefile.in
+@@ -279,6 +279,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -587,7 +590,7 @@
+ all: docs-am  all-recursive
+ 
+ .SUFFIXES:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -625,9 +628,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ mostlyclean-libtool:
+@@ -966,29 +969,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(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/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-konsole.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/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/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/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/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/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/48x48/apps/konsole.png
+ 
+ #>+ 15
+ force-reedit:
 --- konsole/other/wallpapers/Makefile.in
 +++ konsole/other/wallpapers/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38865,16 +30543,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -38883,7 +30552,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38897,15 +30566,7 @@
  mostlyclean-libtool:
 --- kpager/Makefile.in
 +++ kpager/Makefile.in
-@@ -196,6 +196,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -298,6 +299,9 @@
+@@ -299,6 +299,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38915,16 +30576,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -448,6 +452,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -600,7 +606,7 @@
+@@ -603,7 +606,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -38933,7 +30585,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +644,9 @@
+@@ -641,9 +644,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -38945,7 +30597,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -968,20 +974,20 @@
+@@ -971,20 +974,20 @@
  
  #>+ 16
  install-kde-icons:
@@ -38974,15 +30626,7 @@
  force-reedit:
 --- kpersonalizer/Makefile.in
 +++ kpersonalizer/Makefile.in
-@@ -214,6 +214,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -316,6 +317,9 @@
+@@ -317,6 +317,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38992,16 +30636,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -466,6 +470,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -644,7 +650,7 @@
+@@ -647,7 +650,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -39010,7 +30645,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -682,9 +688,9 @@
+@@ -685,9 +688,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39022,7 +30657,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1107,18 +1113,18 @@
+@@ -1110,18 +1113,18 @@
  mocs: krefinepage.moc
  
  #>+ 3
@@ -39047,7 +30682,7 @@
  
  #>+ 3
  kospage.moc: $(srcdir)/kospage.h
-@@ -1129,7 +1135,7 @@
+@@ -1132,7 +1135,7 @@
  
  #>+ 3
  clean-metasources:
@@ -39056,7 +30691,7 @@
  
  #>+ 2
  KDE_DIST=kospagedlg.ui Makefile.in uninstall.desktop stylepreview.ui stylepreview.ui.h ksysinfo.h Makefile.am 
-@@ -1149,14 +1155,14 @@
+@@ -1152,14 +1155,14 @@
  
  #>+ 10
  install-kde-icons:
@@ -39076,15 +30711,7 @@
  force-reedit:
 --- kpersonalizer/pics/Makefile.in
 +++ kpersonalizer/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39094,16 +30721,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -39112,7 +30730,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39126,15 +30744,7 @@
  mostlyclean-libtool:
 --- kreadconfig/Makefile.in
 +++ kreadconfig/Makefile.in
-@@ -189,6 +189,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -291,6 +292,9 @@
+@@ -292,6 +292,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39144,16 +30754,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -441,6 +445,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -587,7 +593,7 @@
+@@ -590,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -39162,7 +30763,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +631,9 @@
+@@ -628,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39176,15 +30777,7 @@
  	@$(NORMAL_INSTALL)
 --- kscreensaver/Makefile.in
 +++ kscreensaver/Makefile.in
-@@ -200,6 +200,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -302,6 +303,9 @@
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39194,16 +30787,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,6 +456,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -605,7 +611,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -39212,7 +30796,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +649,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39226,34 +30810,7 @@
  	@$(NORMAL_INSTALL)
 --- ksmserver/Makefile.in
 +++ ksmserver/Makefile.in
-@@ -89,7 +89,8 @@
- #>- 	$(am__DEPENDENCIES_1)
- #>+ 1
- ksmserver_la_DEPENDENCIES = libkdeinit_ksmserver.la
--#>- am_ksmserver_la_OBJECTS = main.lo server.lo shutdown.lo
-+#>- am_ksmserver_la_OBJECTS = main.lo server.lo shutdowndlg.lo legacy.lo \
-+#>- 	startup.lo shutdown.lo client.lo
- #>+ 1
- am_ksmserver_la_OBJECTS = ksmserver_dummy.lo
- #>- ksmserver_la_OBJECTS = $(am_ksmserver_la_OBJECTS)
-@@ -104,7 +105,7 @@
- #>- testsh_OBJECTS = $(am_testsh_OBJECTS)
- #>+ 1
- testsh_OBJECTS = test.$(OBJEXT)
--testsh_DEPENDENCIES = $(am__DEPENDENCIES_1) shutdown.lo \
-+testsh_DEPENDENCIES = $(am__DEPENDENCIES_1) shutdowndlg.lo \
- 	../kdmlib/libdmctl.la
- updateSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- SCRIPTS = $(update_SCRIPTS)
-@@ -254,6 +255,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -356,6 +358,9 @@
+@@ -358,6 +358,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39263,49 +30820,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -506,6 +511,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -646,15 +653,20 @@
- #>+ 1
- lib_LTLIBRARIES =   libkdeinit_ksmserver.la
- kdeinit_LTLIBRARIES = ksmserver.la
--noinst_HEADERS = global.h server.h shutdown.h
-+noinst_HEADERS = global.h server.h
- #>- ksmserver_la_METASOURCES = AUTO
- #>+ 1
- #>- libkdeinit_ksmserver_la_METASOURCES = AUTO
- # Order is important for --enable-final!
--#>- ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface.skel server.skel
--#>+ 2
-+#>- ksmserver_la_SOURCES = main.cpp server.cpp shutdowndlg.cpp \
-+#>- 	legacy.cpp startup.cpp shutdown.cpp client.cpp \
-+#>- 	KSMServerInterface.skel server.skel
-+#>+ 4
- ksmserver_la_SOURCES = ksmserver_la_dummy.cpp
--libkdeinit_ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp   KSMServerInterface_skel.cpp server_skel.cpp
-+libkdeinit_ksmserver_la_SOURCES = main.cpp server.cpp shutdowndlg.cpp \
-+	legacy.cpp startup.cpp shutdown.cpp client.cpp \
-+	  KSMServerInterface_skel.cpp server_skel.cpp
-+
- ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
- #>- ksmserver_la_LIBADD = ../kdmlib/libdmctl.la $(LIB_KDEUI)
- #>+ 1
-@@ -666,14 +678,14 @@
- updatedir = $(kde_datadir)/kconf_update
- testsh_SOURCES = test.cpp
- testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--testsh_LDADD = $(LIB_KDEUI) shutdown.lo ../kdmlib/libdmctl.la
-+testsh_LDADD = $(LIB_KDEUI) shutdowndlg.lo ../kdmlib/libdmctl.la
- #>- all: all-recursive
- #>+ 1
- all: docs-am  all-recursive
+@@ -682,7 +685,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -39314,7 +30829,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -711,9 +723,9 @@
+@@ -720,9 +723,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39326,166 +30841,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -828,9 +840,13 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/client.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/legacy.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/server.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shutdown.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/shutdowndlg.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/startup.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test.Po at am__quote@
- 
- .cpp.o:
-@@ -1206,8 +1222,9 @@
- libkdeinit_ksmserver_la_DEPENDENCIES = ../kdmlib/libdmctl.la \
- 	$(am__DEPENDENCIES_1)
- 
--#>+ 2
--am_libkdeinit_ksmserver_la_OBJECTS = main.lo server.lo shutdown.lo
-+#>+ 3
-+am_libkdeinit_ksmserver_la_OBJECTS = main.lo server.lo shutdowndlg.lo legacy.lo \
-+	startup.lo shutdown.lo client.lo
- 
- #>+ 13
- 
-@@ -1234,11 +1251,11 @@
- 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub server.kidl
- 
- #>+ 3
--shutdown.moc: $(srcdir)/shutdown.h
--	$(MOC) $(srcdir)/shutdown.h -o shutdown.moc
-+shutdowndlg.moc: $(srcdir)/shutdowndlg.h
-+	$(MOC) $(srcdir)/shutdowndlg.h -o shutdowndlg.moc
- 
- #>+ 2
--mocs: shutdown.moc
-+mocs: shutdowndlg.moc
- 
- #>+ 3
- server.moc: $(srcdir)/server.h
-@@ -1249,10 +1266,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  shutdown.moc server.moc
-+	-rm -f  shutdowndlg.moc server.moc
- 
- #>+ 2
--KDE_DIST=move_session_config.sh Makefile.in LICENSE configure.in.in shutdownkonq.png server2.h ksmserver.upd KSMServerInterface.h Makefile.am 
-+KDE_DIST=move_session_config.sh Makefile.in shutdowndlg.h LICENSE configure.in.in client.h shutdownkonq.png server2.h ksmserver.upd KSMServerInterface.h Makefile.am 
- 
- #>+ 5
- clean-idl:
-@@ -1302,11 +1319,11 @@
- 
- 
- #>+ 11
--libkdeinit_ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp KSMServerInterface_skel.cpp server_skel.cpp  shutdown.moc server.moc
-+libkdeinit_ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdowndlg.cpp $(srcdir)/legacy.cpp $(srcdir)/startup.cpp $(srcdir)/shutdown.cpp $(srcdir)/client.cpp KSMServerInterface_skel.cpp server_skel.cpp  shutdowndlg.moc server.moc
- 	@echo 'creating libkdeinit_ksmserver_la.all_cpp.cpp ...'; \
- 	rm -f libkdeinit_ksmserver_la.all_cpp.files libkdeinit_ksmserver_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_ksmserver_la.all_cpp.final; \
--	for file in main.cpp server.cpp shutdown.cpp KSMServerInterface_skel.cpp server_skel.cpp ; do \
-+	for file in main.cpp server.cpp shutdowndlg.cpp legacy.cpp startup.cpp shutdown.cpp client.cpp KSMServerInterface_skel.cpp server_skel.cpp ; do \
- 	  echo "#include \"$$file\"" >> libkdeinit_ksmserver_la.all_cpp.files; \
- 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdeinit_ksmserver_la.all_cpp.final; \
- 	done; \
-@@ -1317,9 +1334,10 @@
- clean-final:
- 	-rm -f libkdeinit_ksmserver_la.all_cpp.cpp
- 
--#>+ 5
-+#>+ 6
- libkdeinit_ksmserver_la_final_OBJECTS = libkdeinit_ksmserver_la.all_cpp.lo 
--libkdeinit_ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo KSMServerInterface_skel.lo server_skel.lo
-+libkdeinit_ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdowndlg.lo legacy.lo \
-+	startup.lo shutdown.lo client.lo KSMServerInterface_skel.lo server_skel.lo
- @KDE_USE_FINAL_FALSE at libkdeinit_ksmserver_la_OBJECTS = $(libkdeinit_ksmserver_la_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE at libkdeinit_ksmserver_la_OBJECTS = $(libkdeinit_ksmserver_la_final_OBJECTS)
- 
-@@ -1348,15 +1366,15 @@
- 
- #>+ 14
- nmcheck: 
-+shutdowndlg.o: shutdowndlg.moc 
- server.lo: server.moc 
- ksmserver$(EXEEXT): $(ksmserver_OBJECTS) $(ksmserver_DEPENDENCIES)
- 	@rm -f ksmserver$(EXEEXT)
- 	$(CXXLINK) $(ksmserver_LDFLAGS) $(ksmserver_OBJECTS) $(ksmserver_LDADD) $(LIBS)
- 
--shutdown.lo: shutdown.moc 
- nmcheck-am: nmcheck
-+shutdowndlg.lo: shutdowndlg.moc 
- libkdeinit_ksmserver.la: $(libkdeinit_ksmserver_la_OBJECTS) $(libkdeinit_ksmserver_la_DEPENDENCIES)
- 	$(CXXLINK) -rpath $(libdir) $(libkdeinit_ksmserver_la_LDFLAGS) $(libkdeinit_ksmserver_la_OBJECTS) $(libkdeinit_ksmserver_la_LIBADD) $(LIBS)
- 
--shutdown.o: shutdown.moc 
- server.o: server.moc 
---- ksplashml/Makefile.in
-+++ ksplashml/Makefile.in
-@@ -213,6 +213,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -315,6 +316,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -465,6 +469,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -616,7 +622,7 @@
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -654,9 +660,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
 --- ksplashml/kcmksplash/Makefile.in
 +++ ksplashml/kcmksplash/Makefile.in
-@@ -211,6 +211,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -313,6 +314,9 @@
+@@ -314,6 +314,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39495,16 +30853,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -463,6 +467,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -614,7 +620,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -39513,7 +30862,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +658,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39527,15 +30876,7 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/kcmksplash/pics/Makefile.in
 +++ ksplashml/kcmksplash/pics/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39545,16 +30886,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -540,7 +546,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -39563,7 +30895,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39575,7 +30907,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -730,26 +736,26 @@
+@@ -733,26 +736,26 @@
  
  #>+ 22
  install-kde-icons:
@@ -39611,17 +30943,42 @@
  
  #>+ 15
  force-reedit:
+--- ksplashml/Makefile.in
++++ ksplashml/Makefile.in
+@@ -316,6 +316,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -619,7 +622,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -657,9 +660,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
 --- ksplashml/pics/Makefile.in
 +++ ksplashml/pics/Makefile.in
-@@ -174,6 +174,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -276,6 +277,9 @@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39631,16 +30988,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,6 +430,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -569,7 +575,7 @@
+@@ -572,7 +575,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -39649,7 +30997,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +613,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39661,17 +31009,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksplashml/pics/themes/Makefile.in
-+++ ksplashml/pics/themes/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+--- ksplashml/pics/themes/blue-bend/Makefile.in
++++ ksplashml/pics/themes/blue-bend/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39681,17 +31021,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -558,7 +564,7 @@
- all: docs-am  all-recursive
+@@ -555,7 +558,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -39699,7 +31030,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -596,9 +602,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39711,17 +31042,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksplashml/pics/themes/blue-bend/Makefile.in
-+++ ksplashml/pics/themes/blue-bend/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- ksplashml/pics/themes/default/locolor/Makefile.in
++++ ksplashml/pics/themes/default/locolor/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39731,16 +31054,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -39749,7 +31063,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39763,15 +31077,7 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/default/Makefile.in
 +++ ksplashml/pics/themes/default/Makefile.in
-@@ -174,6 +174,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -276,6 +277,9 @@
+@@ -277,6 +277,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39781,16 +31087,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -426,6 +430,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -569,7 +575,7 @@
+@@ -572,7 +575,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -39799,7 +31096,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +613,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39811,17 +31108,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksplashml/pics/themes/default/locolor/Makefile.in
-+++ ksplashml/pics/themes/default/locolor/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+--- ksplashml/pics/themes/Makefile.in
++++ ksplashml/pics/themes/Makefile.in
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39831,17 +31120,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
- all: docs-am  all-am
+@@ -561,7 +564,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -39849,7 +31129,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39863,15 +31143,7 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/none/Makefile.in
 +++ ksplashml/pics/themes/none/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39881,16 +31153,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -39899,7 +31162,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39913,15 +31176,7 @@
  mostlyclean-libtool:
 --- ksplashml/pics/themes/simple/Makefile.in
 +++ ksplashml/pics/themes/simple/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39931,16 +31186,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -39949,7 +31195,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -39961,17 +31207,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- ksplashml/themeengine/Makefile.in
-+++ ksplashml/themeengine/Makefile.in
-@@ -215,6 +215,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -317,6 +318,9 @@
+--- ksplashml/themeengine/default/Makefile.in
++++ ksplashml/themeengine/default/Makefile.in
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -39981,16 +31219,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -467,6 +471,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -617,7 +623,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -39999,7 +31228,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +661,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40009,19 +31238,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- ksplashml/themeengine/default/Makefile.in
-+++ ksplashml/themeengine/default/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+--- ksplashml/themeengine/Makefile.in
++++ ksplashml/themeengine/Makefile.in
+@@ -318,6 +318,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40031,16 +31252,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -603,7 +609,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -40049,7 +31261,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +647,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40059,19 +31271,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/redmond/Makefile.in
 +++ ksplashml/themeengine/redmond/Makefile.in
-@@ -213,6 +213,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -315,6 +316,9 @@
+@@ -316,6 +316,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40081,16 +31285,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -465,6 +469,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -617,7 +623,7 @@
+@@ -620,7 +623,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -40099,7 +31294,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -655,9 +661,9 @@
+@@ -658,9 +661,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40113,15 +31308,7 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/redmond/pics/Makefile.in
 +++ ksplashml/themeengine/redmond/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40131,16 +31318,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -40149,7 +31327,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40163,15 +31341,7 @@
  mostlyclean-libtool:
 --- ksplashml/themeengine/simple/Makefile.in
 +++ ksplashml/themeengine/simple/Makefile.in
-@@ -183,6 +183,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -285,6 +286,9 @@
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40181,16 +31351,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -435,6 +439,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -579,7 +585,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -40199,7 +31360,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +623,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40213,15 +31374,7 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/standard/Makefile.in
 +++ ksplashml/themeengine/standard/Makefile.in
-@@ -222,6 +222,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -324,6 +325,9 @@
+@@ -325,6 +325,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40231,16 +31384,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -474,6 +478,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -630,7 +636,7 @@
+@@ -633,7 +636,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -40249,7 +31393,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -668,9 +674,9 @@
+@@ -671,9 +674,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40263,15 +31407,7 @@
  	@$(NORMAL_INSTALL)
 --- ksplashml/themeengine/standard/pics/Makefile.in
 +++ ksplashml/themeengine/standard/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40281,16 +31417,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -552,7 +558,7 @@
+@@ -555,7 +558,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -40299,7 +31426,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -590,9 +596,9 @@
+@@ -593,9 +596,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40313,15 +31440,7 @@
  mostlyclean-libtool:
 --- kstart/Makefile.in
 +++ kstart/Makefile.in
-@@ -187,6 +187,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -289,6 +290,9 @@
+@@ -290,6 +290,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40331,16 +31450,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -439,6 +443,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -587,7 +593,7 @@
+@@ -590,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -40349,7 +31459,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +631,9 @@
+@@ -628,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40363,15 +31473,7 @@
  	@$(NORMAL_INSTALL)
 --- ksysguard/CContLib/Makefile.in
 +++ ksysguard/CContLib/Makefile.in
-@@ -173,6 +173,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -275,6 +276,9 @@
+@@ -276,6 +276,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40381,16 +31483,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -425,6 +429,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -569,7 +575,7 @@
+@@ -572,7 +575,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -40399,7 +31492,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +613,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40411,17 +31504,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
---- ksysguard/Makefile.in
-+++ ksysguard/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+--- ksysguard/example/Makefile.in
++++ ksysguard/example/Makefile.in
+@@ -263,6 +263,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40431,17 +31516,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -560,7 +566,7 @@
- all: docs-am  all-recursive
+@@ -558,7 +561,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -40449,7 +31525,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -598,9 +604,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40461,50 +31537,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -898,23 +904,23 @@
- 
- #>+ 19
- install-kde-icons:
--	$(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
- 	$(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/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/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/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/64x64/apps/ksysguard.png
- 
- #>+ 15
- force-reedit:
---- ksysguard/example/Makefile.in
-+++ ksysguard/example/Makefile.in
-@@ -160,6 +160,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -262,6 +263,9 @@
+--- ksysguard/gui/ksgrd/Makefile.in
++++ ksysguard/gui/ksgrd/Makefile.in
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40514,25 +31549,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -412,6 +416,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
- all: docs-am  all-am
+@@ -628,7 +631,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cc .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -666,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40542,19 +31568,72 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -971,13 +974,6 @@
+ mocs: SensorSocketAgent.moc
  
- mostlyclean-libtool:
+ #>+ 3
+-StyleSettings.moc: $(srcdir)/StyleSettings.h
+-	$(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
+-
+-#>+ 2
+-mocs: StyleSettings.moc
+-
+-#>+ 3
+ SensorManager.moc: $(srcdir)/SensorManager.h
+ 	$(MOC) $(srcdir)/SensorManager.h -o SensorManager.moc
+ 
+@@ -985,11 +981,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 +995,13 @@
+ mocs: SensorShellAgent.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 +1017,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.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 +1068,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  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; \
 --- ksysguard/gui/Makefile.in
 +++ ksysguard/gui/Makefile.in
-@@ -253,6 +253,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -355,6 +356,9 @@
+@@ -356,6 +356,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40564,16 +31643,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -505,6 +509,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -700,7 +706,7 @@
+@@ -703,7 +706,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -40582,7 +31652,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -738,9 +744,9 @@
+@@ -741,9 +744,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40596,15 +31666,7 @@
  	@$(NORMAL_INSTALL)
 --- ksysguard/gui/SensorDisplayLib/Makefile.in
 +++ ksysguard/gui/SensorDisplayLib/Makefile.in
-@@ -193,6 +193,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -295,6 +296,9 @@
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40614,16 +31676,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,6 +449,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -650,7 +656,7 @@
+@@ -653,7 +656,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -40632,7 +31685,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -688,9 +694,9 @@
+@@ -691,9 +694,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40644,7 +31697,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -949,18 +955,18 @@
+@@ -952,18 +955,18 @@
  
  
  #>+ 3
@@ -40669,7 +31722,7 @@
  
  #>+ 3
  DummyDisplay.moc: $(srcdir)/DummyDisplay.h
-@@ -1012,18 +1018,18 @@
+@@ -1015,18 +1018,18 @@
  mocs: ListView.moc
  
  #>+ 3
@@ -40694,7 +31747,7 @@
  
  #>+ 3
  DancingBarsSettings.moc: $(srcdir)/DancingBarsSettings.h
-@@ -1083,7 +1089,7 @@
+@@ -1086,7 +1089,7 @@
  
  #>+ 3
  clean-metasources:
@@ -40703,7 +31756,7 @@
  
  #>+ 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 
-@@ -1143,7 +1149,7 @@
+@@ -1146,7 +1149,7 @@
  
  
  #>+ 11
@@ -40712,17 +31765,9 @@
  	@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; \
---- ksysguard/gui/ksgrd/Makefile.in
-+++ ksysguard/gui/ksgrd/Makefile.in
-@@ -198,6 +198,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -300,6 +301,9 @@
+--- ksysguard/ksysguardd/FreeBSD/Makefile.in
++++ ksysguard/ksysguardd/FreeBSD/Makefile.in
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40732,25 +31777,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,6 +454,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -625,7 +631,7 @@
+@@ -580,7 +583,7 @@
  
  .SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .SUFFIXES: .c .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +669,9 @@
+@@ -618,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40760,80 +31796,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -968,13 +974,6 @@
- mocs: SensorSocketAgent.moc
  
- #>+ 3
--StyleSettings.moc: $(srcdir)/StyleSettings.h
--	$(MOC) $(srcdir)/StyleSettings.h -o StyleSettings.moc
--
--#>+ 2
--mocs: StyleSettings.moc
--
--#>+ 3
- SensorManager.moc: $(srcdir)/SensorManager.h
- 	$(MOC) $(srcdir)/SensorManager.h -o SensorManager.moc
- 
-@@ -982,11 +981,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
-@@ -996,6 +995,13 @@
- mocs: SensorShellAgent.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
- 
-@@ -1011,7 +1017,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  TimerSettings.moc SensorSocketAgent.moc StyleSettings.moc SensorManager.moc StyleEngine.moc SensorShellAgent.moc HostConnector.moc SensorAgent.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 
-@@ -1062,7 +1068,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  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; \
---- ksysguard/ksysguardd/FreeBSD/Makefile.in
-+++ ksysguard/ksysguardd/FreeBSD/Makefile.in
-@@ -180,6 +180,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -282,6 +283,9 @@
+ clean-noinstLIBRARIES:
+--- ksysguard/ksysguardd/Irix/Makefile.in
++++ ksysguard/ksysguardd/Irix/Makefile.in
+@@ -278,6 +278,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40843,16 +31810,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -432,6 +436,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -577,7 +583,7 @@
+@@ -573,7 +576,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -40861,7 +31819,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +621,9 @@
+@@ -611,9 +614,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40873,17 +31831,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/Irix/Makefile.in
-+++ ksysguard/ksysguardd/Irix/Makefile.in
-@@ -175,6 +175,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -277,6 +278,9 @@
+--- ksysguard/ksysguardd/Linux/Makefile.in
++++ ksysguard/ksysguardd/Linux/Makefile.in
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40893,16 +31843,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -427,6 +431,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -570,7 +576,7 @@
+@@ -586,7 +589,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -40911,7 +31852,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -608,9 +614,9 @@
+@@ -624,9 +627,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40923,17 +31864,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/Linux/Makefile.in
-+++ ksysguard/ksysguardd/Linux/Makefile.in
-@@ -181,6 +181,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -283,6 +284,9 @@
+--- ksysguard/ksysguardd/Makefile.in
++++ ksysguard/ksysguardd/Makefile.in
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40943,16 +31876,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,6 +437,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -583,7 +589,7 @@
+@@ -605,7 +608,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -40961,7 +31885,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -621,9 +627,9 @@
+@@ -643,9 +646,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -40971,19 +31895,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/Makefile.in
-+++ ksysguard/ksysguardd/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+--- ksysguard/ksysguardd/NetBSD/Makefile.in
++++ ksysguard/ksysguardd/NetBSD/Makefile.in
+@@ -283,6 +283,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40993,16 +31909,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -602,7 +608,7 @@
+@@ -580,7 +583,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -41011,7 +31918,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +646,9 @@
+@@ -618,9 +621,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41021,19 +31928,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
---- ksysguard/ksysguardd/NetBSD/Makefile.in
-+++ ksysguard/ksysguardd/NetBSD/Makefile.in
-@@ -180,6 +180,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -282,6 +283,9 @@
+ 
+ clean-noinstLIBRARIES:
+--- ksysguard/ksysguardd/OpenBSD/Makefile.in
++++ ksysguard/ksysguardd/OpenBSD/Makefile.in
+@@ -276,6 +276,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41043,16 +31942,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -432,6 +436,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -577,7 +583,7 @@
+@@ -572,7 +575,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -41061,7 +31951,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -615,9 +621,9 @@
+@@ -610,9 +613,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41073,17 +31963,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/OpenBSD/Makefile.in
-+++ ksysguard/ksysguardd/OpenBSD/Makefile.in
-@@ -173,6 +173,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -275,6 +276,9 @@
+--- ksysguard/ksysguardd/Solaris/Makefile.in
++++ ksysguard/ksysguardd/Solaris/Makefile.in
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41093,16 +31975,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -425,6 +429,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -569,7 +575,7 @@
+@@ -579,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -41111,7 +31984,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +613,9 @@
+@@ -617,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41123,17 +31996,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/Solaris/Makefile.in
-+++ ksysguard/ksysguardd/Solaris/Makefile.in
-@@ -181,6 +181,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -283,6 +284,9 @@
+--- ksysguard/ksysguardd/Tru64/Makefile.in
++++ ksysguard/ksysguardd/Tru64/Makefile.in
+@@ -286,6 +286,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41143,16 +32008,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,6 +437,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -576,7 +582,7 @@
+@@ -585,7 +588,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -41161,7 +32017,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +620,9 @@
+@@ -623,9 +626,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41171,19 +32027,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- clean-noinstLIBRARIES:
---- ksysguard/ksysguardd/Tru64/Makefile.in
-+++ ksysguard/ksysguardd/Tru64/Makefile.in
-@@ -183,6 +183,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -285,6 +286,9 @@
+ install-libLIBRARIES: $(lib_LIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- ksysguard/Makefile.in
++++ ksysguard/Makefile.in
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41193,25 +32041,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -435,6 +439,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -582,7 +588,7 @@
+@@ -563,7 +566,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -620,9 +626,9 @@
+@@ -601,9 +604,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41221,19 +32060,44 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLIBRARIES: $(lib_LIBRARIES)
- 	@$(NORMAL_INSTALL)
+ 
+ mostlyclean-libtool:
+@@ -901,23 +904,23 @@
+ 
+ #>+ 19
+ install-kde-icons:
+-	$(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
+ 	$(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/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/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/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/64x64/apps/ksysguard.png
+ 
+ #>+ 15
+ force-reedit:
 --- ksysguard/pics/Makefile.in
 +++ ksysguard/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41243,16 +32107,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -41261,7 +32116,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41275,15 +32130,7 @@
  mostlyclean-libtool:
 --- ksystraycmd/Makefile.in
 +++ ksystraycmd/Makefile.in
-@@ -191,6 +191,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -293,6 +294,9 @@
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41293,16 +32140,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,6 +447,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -589,7 +595,7 @@
+@@ -592,7 +595,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -41311,7 +32149,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -627,9 +633,9 @@
+@@ -630,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41325,15 +32163,7 @@
  	@$(NORMAL_INSTALL)
 --- ktip/Makefile.in
 +++ ktip/Makefile.in
-@@ -208,6 +208,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -310,6 +311,9 @@
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41343,16 +32173,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,6 +464,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -612,7 +618,7 @@
+@@ -615,7 +618,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -41361,7 +32182,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +656,9 @@
+@@ -653,9 +656,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41373,7 +32194,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1085,29 +1091,29 @@
+@@ -1088,29 +1091,29 @@
  
  #>+ 25
  install-kde-icons:
@@ -41414,15 +32235,7 @@
  force-reedit:
 --- ktip/pics/Makefile.in
 +++ ktip/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41432,16 +32245,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
+@@ -554,7 +557,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -41450,7 +32254,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41462,17 +32266,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
---- kwin/Makefile.in
-+++ kwin/Makefile.in
-@@ -232,6 +232,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -334,6 +335,9 @@
+--- kwin/clients/b2/config/Makefile.in
++++ kwin/clients/b2/config/Makefile.in
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41482,215 +32278,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -484,6 +488,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -656,7 +662,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -694,9 +700,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
-@@ -1333,64 +1339,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
--mocs: workspace.moc
-+mocs: client.moc
- 
- #>+ 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 
-@@ -1405,17 +1411,17 @@
- 
- #>+ 13
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/cr48-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
- 
- #>+ 15
- force-reedit:
-@@ -1456,7 +1462,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; \
-@@ -1509,13 +1515,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/clients/Makefile.in
-+++ kwin/clients/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41700,19 +32297,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- kwin/clients/b2/Makefile.in
 +++ kwin/clients/b2/Makefile.in
-@@ -206,6 +206,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -308,6 +309,9 @@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41722,16 +32311,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -458,6 +462,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -610,7 +616,7 @@
+@@ -613,7 +616,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -41740,7 +32320,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -648,9 +654,9 @@
+@@ -651,9 +654,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41752,17 +32332,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/b2/config/Makefile.in
-+++ kwin/clients/b2/config/Makefile.in
-@@ -190,6 +190,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -292,6 +293,9 @@
+--- kwin/clients/default/config/Makefile.in
++++ kwin/clients/default/config/Makefile.in
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41772,16 +32344,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,6 +446,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -590,7 +596,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -41790,7 +32353,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +634,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41804,15 +32367,7 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/default/Makefile.in
 +++ kwin/clients/default/Makefile.in
-@@ -205,6 +205,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -307,6 +308,9 @@
+@@ -308,6 +308,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41822,16 +32377,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -457,6 +461,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -605,7 +611,7 @@
+@@ -608,7 +611,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -41840,7 +32386,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -643,9 +649,9 @@
+@@ -646,9 +649,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41852,17 +32398,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/default/config/Makefile.in
-+++ kwin/clients/default/config/Makefile.in
-@@ -190,6 +190,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -292,6 +293,9 @@
+--- kwin/clients/keramik/config/Makefile.in
++++ kwin/clients/keramik/config/Makefile.in
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41872,16 +32410,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,6 +446,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -590,7 +596,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -41890,7 +32419,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +634,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41904,15 +32433,7 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/keramik/Makefile.in
 +++ kwin/clients/keramik/Makefile.in
-@@ -216,6 +216,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -318,6 +319,9 @@
+@@ -319,6 +319,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41922,16 +32443,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -468,6 +472,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -625,7 +631,7 @@
+@@ -628,7 +631,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -41940,7 +32452,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -663,9 +669,9 @@
+@@ -666,9 +669,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -41952,17 +32464,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/keramik/config/Makefile.in
-+++ kwin/clients/keramik/config/Makefile.in
-@@ -193,6 +193,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -295,6 +296,9 @@
+--- kwin/clients/kwmtheme/cli_installer/Makefile.in
++++ kwin/clients/kwmtheme/cli_installer/Makefile.in
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41972,16 +32476,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,6 +449,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -595,7 +601,7 @@
+@@ -590,7 +593,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -41990,7 +32485,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -633,9 +639,9 @@
+@@ -628,9 +631,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42000,19 +32495,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 --- kwin/clients/kwmtheme/Makefile.in
 +++ kwin/clients/kwmtheme/Makefile.in
-@@ -206,6 +206,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -308,6 +309,9 @@
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42022,16 +32509,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -458,6 +462,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -608,7 +614,7 @@
+@@ -611,7 +614,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42040,7 +32518,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -646,9 +652,9 @@
+@@ -649,9 +652,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42052,17 +32530,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/kwmtheme/cli_installer/Makefile.in
-+++ kwin/clients/kwmtheme/cli_installer/Makefile.in
-@@ -182,6 +182,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -284,6 +285,9 @@
+--- kwin/clients/laptop/Makefile.in
++++ kwin/clients/laptop/Makefile.in
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42072,16 +32542,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -434,6 +438,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -587,7 +593,7 @@
+@@ -597,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42090,7 +32551,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -625,9 +631,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42100,19 +32561,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/laptop/Makefile.in
-+++ kwin/clients/laptop/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+--- kwin/clients/Makefile.in
++++ kwin/clients/Makefile.in
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42122,25 +32575,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -594,7 +600,7 @@
+@@ -559,7 +562,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +638,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42150,19 +32594,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- kwin/clients/modernsystem/Makefile.in
-+++ kwin/clients/modernsystem/Makefile.in
-@@ -206,6 +206,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -308,6 +309,9 @@
+ 
+ mostlyclean-libtool:
+--- kwin/clients/modernsystem/config/Makefile.in
++++ kwin/clients/modernsystem/config/Makefile.in
+@@ -294,6 +294,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42172,16 +32608,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -458,6 +462,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -609,7 +615,7 @@
+@@ -594,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42190,7 +32617,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -647,9 +653,9 @@
+@@ -632,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42202,17 +32629,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/modernsystem/config/Makefile.in
-+++ kwin/clients/modernsystem/config/Makefile.in
-@@ -191,6 +191,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -293,6 +294,9 @@
+--- kwin/clients/modernsystem/Makefile.in
++++ kwin/clients/modernsystem/Makefile.in
+@@ -309,6 +309,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42222,16 +32641,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -443,6 +447,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -591,7 +597,7 @@
+@@ -612,7 +615,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42240,7 +32650,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +635,9 @@
+@@ -650,9 +653,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42252,17 +32662,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/plastik/Makefile.in
-+++ kwin/clients/plastik/Makefile.in
-@@ -210,6 +210,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -312,6 +313,9 @@
+--- kwin/clients/plastik/config/Makefile.in
++++ kwin/clients/plastik/config/Makefile.in
+@@ -296,6 +296,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42272,16 +32674,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -462,6 +466,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -614,7 +620,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42290,7 +32683,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -652,9 +658,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42302,17 +32695,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/plastik/config/Makefile.in
-+++ kwin/clients/plastik/config/Makefile.in
-@@ -193,6 +193,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -295,6 +296,9 @@
+--- kwin/clients/plastik/Makefile.in
++++ kwin/clients/plastik/Makefile.in
+@@ -313,6 +313,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42322,16 +32707,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -445,6 +449,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -617,7 +620,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42340,7 +32716,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -655,9 +658,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42352,17 +32728,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/quartz/Makefile.in
-+++ kwin/clients/quartz/Makefile.in
-@@ -208,6 +208,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -310,6 +311,9 @@
+--- kwin/clients/quartz/config/Makefile.in
++++ kwin/clients/quartz/config/Makefile.in
+@@ -293,6 +293,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42372,16 +32740,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -460,6 +464,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -611,7 +617,7 @@
+@@ -593,7 +596,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42390,7 +32749,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -649,9 +655,9 @@
+@@ -631,9 +634,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42402,17 +32761,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/clients/quartz/config/Makefile.in
-+++ kwin/clients/quartz/config/Makefile.in
-@@ -190,6 +190,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -292,6 +293,9 @@
+--- kwin/clients/quartz/Makefile.in
++++ kwin/clients/quartz/Makefile.in
+@@ -311,6 +311,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42422,16 +32773,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -442,6 +446,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -590,7 +596,7 @@
+@@ -614,7 +617,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42440,7 +32782,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -628,9 +634,9 @@
+@@ -652,9 +655,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42454,15 +32796,7 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/redmond/Makefile.in
 +++ kwin/clients/redmond/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42472,16 +32806,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -596,7 +602,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42490,7 +32815,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -634,9 +640,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42504,15 +32829,7 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/test/Makefile.in
 +++ kwin/clients/test/Makefile.in
-@@ -192,6 +192,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -294,6 +295,9 @@
+@@ -295,6 +295,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42522,16 +32839,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -444,6 +448,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -594,7 +600,7 @@
+@@ -597,7 +600,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42540,7 +32848,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +638,9 @@
+@@ -635,9 +638,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42554,15 +32862,7 @@
  	@$(NORMAL_INSTALL)
 --- kwin/clients/web/Makefile.in
 +++ kwin/clients/web/Makefile.in
-@@ -197,6 +197,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -299,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42572,16 +32872,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -449,6 +453,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -599,7 +605,7 @@
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42590,7 +32881,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -637,9 +643,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42604,15 +32895,7 @@
  	@$(NORMAL_INSTALL)
 --- kwin/data/Makefile.in
 +++ kwin/data/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42622,16 +32905,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -604,7 +610,7 @@
+@@ -607,7 +610,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42640,7 +32914,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +648,9 @@
+@@ -645,9 +648,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42652,17 +32926,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kconfPROGRAMS: $(kconf_PROGRAMS)
  	@$(NORMAL_INSTALL)
---- kwin/kcmkwin/Makefile.in
-+++ kwin/kcmkwin/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
+--- kwin/kcmkwin/kwindecoration/Makefile.in
++++ kwin/kcmkwin/kwindecoration/Makefile.in
+@@ -303,6 +303,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42672,25 +32938,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
- all: docs-am  all-recursive
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42700,19 +32957,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
---- kwin/kcmkwin/kwindecoration/Makefile.in
-+++ kwin/kcmkwin/kwindecoration/Makefile.in
-@@ -200,6 +200,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -302,6 +303,9 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+--- kwin/kcmkwin/kwinoptions/Makefile.in
++++ kwin/kcmkwin/kwinoptions/Makefile.in
+@@ -302,6 +302,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42722,16 +32971,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -452,6 +456,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -607,7 +613,7 @@
+@@ -606,7 +609,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42740,7 +32980,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +651,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42752,17 +32992,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/kcmkwin/kwinoptions/Makefile.in
-+++ kwin/kcmkwin/kwinoptions/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+--- kwin/kcmkwin/kwinrules/Makefile.in
++++ kwin/kcmkwin/kwinrules/Makefile.in
+@@ -332,6 +332,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42772,16 +33004,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -603,7 +609,7 @@
+@@ -658,7 +661,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42790,7 +33013,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +647,9 @@
+@@ -696,9 +699,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42802,17 +33025,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- kwin/kcmkwin/kwinrules/Makefile.in
-+++ kwin/kcmkwin/kwinrules/Makefile.in
-@@ -229,6 +229,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -331,6 +332,9 @@
+--- kwin/kcmkwin/Makefile.in
++++ kwin/kcmkwin/Makefile.in
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42822,25 +33037,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -481,6 +485,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -655,7 +661,7 @@
+@@ -559,7 +562,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -693,9 +699,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42850,19 +33056,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
+ 
+ mostlyclean-libtool:
 --- kwin/killer/Makefile.in
 +++ kwin/killer/Makefile.in
-@@ -182,6 +182,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -284,6 +285,9 @@
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42872,16 +33070,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -434,6 +438,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -579,7 +585,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42890,7 +33079,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +623,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42904,15 +33093,7 @@
  	@$(NORMAL_INSTALL)
 --- kwin/kompmgr/Makefile.in
 +++ kwin/kompmgr/Makefile.in
-@@ -173,6 +173,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -275,6 +276,9 @@
+@@ -276,6 +276,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42922,16 +33103,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -425,6 +429,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -568,7 +574,7 @@
+@@ -571,7 +574,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -42940,7 +33112,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -606,9 +612,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -42954,15 +33126,7 @@
  	@$(NORMAL_INSTALL)
 --- kwin/lib/Makefile.in
 +++ kwin/lib/Makefile.in
-@@ -198,6 +198,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -300,6 +301,9 @@
+@@ -301,6 +301,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42972,16 +33136,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -450,6 +454,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -607,7 +613,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -42990,7 +33145,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -645,9 +651,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43002,17 +33157,182 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- kwin/Makefile.in
++++ kwin/Makefile.in
+@@ -335,6 +335,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -659,7 +662,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../admin/Doxyfile.am $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -697,9 +700,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+@@ -1336,64 +1339,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
+-mocs: workspace.moc
++mocs: client.moc
+ 
+ #>+ 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 +1411,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kwin.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwin.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwin.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1459,7 +1462,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 +1515,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
-@@ -161,6 +161,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -263,6 +264,9 @@
+@@ -264,6 +264,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43022,16 +33342,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -413,6 +417,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -554,7 +560,7 @@
+@@ -557,7 +560,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -43040,7 +33351,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -592,9 +598,9 @@
+@@ -595,9 +598,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43054,15 +33365,7 @@
  mostlyclean-libtool:
 --- kwin/pics/Makefile.in
 +++ kwin/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43072,16 +33375,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -555,7 +561,7 @@
+@@ -558,7 +561,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -43090,7 +33384,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +599,9 @@
+@@ -596,9 +599,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43102,7 +33396,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -755,7 +761,7 @@
+@@ -758,7 +761,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -43111,17 +33405,9 @@
  
  #>+ 2
  docs-am:
---- kwin/tools/Makefile.in
-+++ kwin/tools/Makefile.in
-@@ -194,6 +194,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -296,6 +297,9 @@
+--- kwin/tools/decobenchmark/Makefile.in
++++ kwin/tools/decobenchmark/Makefile.in
+@@ -285,6 +285,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43131,16 +33417,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -446,6 +450,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -592,7 +598,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -43149,7 +33426,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -630,9 +636,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43161,17 +33438,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
---- kwin/tools/decobenchmark/Makefile.in
-+++ kwin/tools/decobenchmark/Makefile.in
-@@ -182,6 +182,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -284,6 +285,9 @@
+--- kwin/tools/Makefile.in
++++ kwin/tools/Makefile.in
+@@ -297,6 +297,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43181,16 +33450,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -434,6 +438,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -579,7 +585,7 @@
+@@ -595,7 +598,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -43199,7 +33459,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +623,9 @@
+@@ -633,9 +636,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43213,15 +33473,7 @@
  clean-noinstPROGRAMS:
 --- kxkb/Makefile.in
 +++ kxkb/Makefile.in
-@@ -234,6 +234,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -336,6 +337,9 @@
+@@ -337,6 +337,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43231,16 +33483,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -486,6 +490,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -658,7 +664,7 @@
+@@ -661,7 +664,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -43249,7 +33492,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -696,9 +702,9 @@
+@@ -699,9 +702,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43263,15 +33506,7 @@
  	@$(NORMAL_INSTALL)
 --- kxkb/pics/Makefile.in
 +++ kxkb/pics/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43281,16 +33516,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -540,7 +546,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -43299,7 +33525,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43311,7 +33537,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -732,15 +738,15 @@
+@@ -735,15 +738,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
@@ -43332,15 +33558,7 @@
  force-reedit:
 --- l10n/Makefile.in
 +++ l10n/Makefile.in
-@@ -159,6 +159,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -261,6 +262,9 @@
+@@ -262,6 +262,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43350,16 +33568,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -411,6 +415,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -561,7 +567,7 @@
+@@ -564,7 +567,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -43368,7 +33577,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +605,9 @@
+@@ -602,9 +605,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43380,7 +33589,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -772,7 +778,7 @@
+@@ -775,7 +778,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -43389,17 +33598,42 @@
  
  #>+ 2
  docs-am:
+--- libkonq/favicons/Makefile.in
++++ libkonq/favicons/Makefile.in
+@@ -302,6 +302,9 @@
+ LINUXCDPOLLING = @LINUXCDPOLLING@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -607,7 +610,7 @@
+ 
+ .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ #>- 	@for dep in $?; do \
+ #>- 	  case '$(am__configure_deps)' in \
+ #>- 	    *$$dep*) \
+@@ -645,9 +648,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-$(top_srcdir)/configure:  $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
 --- libkonq/Makefile.in
 +++ libkonq/Makefile.in
-@@ -252,6 +252,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -354,6 +355,9 @@
+@@ -355,6 +355,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43409,16 +33643,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -504,6 +508,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -695,7 +701,7 @@
+@@ -698,7 +701,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -43427,7 +33652,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -733,9 +739,9 @@
+@@ -736,9 +739,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43439,7 +33664,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1359,18 +1365,18 @@
+@@ -1362,18 +1365,18 @@
  mocs: knewmenu.moc
  
  #>+ 3
@@ -43464,7 +33689,7 @@
  
  #>+ 3
  konq_faviconmgr.moc: $(srcdir)/konq_faviconmgr.h
-@@ -1425,7 +1431,7 @@
+@@ -1428,7 +1431,7 @@
  
  #>+ 3
  clean-metasources:
@@ -43473,7 +33698,7 @@
  
  #>+ 2
  KDE_DIST=SERVICEMENUS DESIGN Makefile.in konq_bgnddlg.h directory_bookmarkbar.desktop konqpopupmenuplugin.desktop PLUGINS Makefile.am 
-@@ -1483,7 +1489,7 @@
+@@ -1486,7 +1489,7 @@
  
  
  #>+ 11
@@ -43482,7 +33707,7 @@
  	@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; \
-@@ -1524,8 +1530,8 @@
+@@ -1527,8 +1530,8 @@
  konq_bgnddlg.o: konq_bgnddlg.moc 
  konq_bgnddlg.lo: konq_bgnddlg.moc 
  konq_faviconmgr.lo: konq_faviconmgr.moc 
@@ -43492,17 +33717,9 @@
  konq_filetip.lo: konq_filetip.moc 
  konq_drag.lo: konq_drag.moc 
  konq_popupmenu.o: konq_popupmenu.moc 
---- libkonq/favicons/Makefile.in
-+++ libkonq/favicons/Makefile.in
-@@ -199,6 +199,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -301,6 +302,9 @@
+--- libkonq/pics/Makefile.in
++++ libkonq/pics/Makefile.in
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43512,25 +33729,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -451,6 +455,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -604,7 +610,7 @@
+@@ -554,7 +557,7 @@
+ all: docs-am  all-am
  
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +648,9 @@
+@@ -592,9 +595,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43540,19 +33748,11 @@
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
---- libkonq/pics/Makefile.in
-+++ libkonq/pics/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+ 
+ mostlyclean-libtool:
+--- libkonq/tests/Makefile.in
++++ libkonq/tests/Makefile.in
+@@ -280,6 +280,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43562,25 +33762,16 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -551,7 +557,7 @@
- all: docs-am  all-am
+@@ -577,7 +580,7 @@
  
  .SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +595,9 @@
+@@ -615,9 +618,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43591,18 +33782,10 @@
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
- mostlyclean-libtool:
---- libkonq/tests/Makefile.in
-+++ libkonq/tests/Makefile.in
-@@ -177,6 +177,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -279,6 +280,9 @@
+ clean-checkPROGRAMS:
+--- Makefile.in
++++ Makefile.in
+@@ -289,6 +289,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43612,47 +33795,51 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -429,6 +433,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -574,7 +580,7 @@
- 
+@@ -592,7 +595,7 @@
  .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+ am--refresh:
+ 	@:
+-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/Doxyfile.am $(srcdir)/admin/deps.am $(am__configure_deps)
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -612,9 +618,9 @@
+@@ -634,12 +637,12 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	$(SHELL) ./config.status --recheck
  
 -$(top_srcdir)/configure:  $(am__configure_deps)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>- 	cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ 	cd $(srcdir) && rm -f configure
+ 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
 -$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
- clean-checkPROGRAMS:
+ config.h: stamp-h1
+@@ -651,7 +654,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in:  $(am__configure_deps) 
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+ 	rm -f stamp-h1
+ 	touch $@
+@@ -1188,7 +1191,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=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:
 --- nsplugins/Makefile.in
 +++ nsplugins/Makefile.in
-@@ -229,6 +229,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -331,6 +332,9 @@
+@@ -332,6 +332,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43662,16 +33849,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -481,6 +485,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -650,7 +656,7 @@
+@@ -653,7 +656,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -43680,7 +33858,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -688,9 +694,9 @@
+@@ -691,9 +694,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43694,15 +33872,7 @@
  	@$(NORMAL_INSTALL)
 --- nsplugins/test/Makefile.in
 +++ nsplugins/test/Makefile.in
-@@ -181,6 +181,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -283,6 +284,9 @@
+@@ -284,6 +284,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43712,16 +33882,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -433,6 +437,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -579,7 +585,7 @@
+@@ -582,7 +585,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -43730,7 +33891,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -617,9 +623,9 @@
+@@ -620,9 +623,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43744,15 +33905,7 @@
  clean-checkPROGRAMS:
 --- nsplugins/viewer/Makefile.in
 +++ nsplugins/viewer/Makefile.in
-@@ -188,6 +188,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -290,6 +291,9 @@
+@@ -291,6 +291,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43762,16 +33915,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -440,6 +444,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -591,7 +597,7 @@
+@@ -594,7 +597,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -43780,7 +33924,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -629,9 +635,9 @@
+@@ -632,9 +635,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43794,15 +33938,7 @@
  	@$(NORMAL_INSTALL)
 --- nsplugins/wrapper/Makefile.in
 +++ nsplugins/wrapper/Makefile.in
-@@ -176,6 +176,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -278,6 +279,9 @@
+@@ -279,6 +279,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43812,16 +33948,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -428,6 +432,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -571,7 +577,7 @@
+@@ -574,7 +577,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -43830,7 +33957,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -609,9 +615,9 @@
+@@ -612,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43842,67 +33969,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
---- pics/Makefile.in
-+++ pics/Makefile.in
-@@ -164,6 +164,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -266,6 +267,9 @@
- LINUXCDPOLLING = @LINUXCDPOLLING@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -416,6 +420,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -556,7 +562,7 @@
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
- #>- 	@for dep in $?; do \
- #>- 	  case '$(am__configure_deps)' in \
- #>- 	    *$$dep*) \
-@@ -594,9 +600,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
 --- pics/crystalsvg/Makefile.in
 +++ pics/crystalsvg/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43912,16 +33981,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -540,7 +546,7 @@
+@@ -543,7 +546,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -43930,7 +33990,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +584,9 @@
+@@ -581,9 +584,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -43942,17 +34002,17 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -723,840 +729,840 @@
+@@ -726,842 +729,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 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-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 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 
+-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-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:
  
- #>+ 829
+ #>+ 831
  install-kde-icons:
 -	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
 -	$(INSTALL_DATA) $(srcdir)/cr16-app-mozilla.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/mozilla.png
@@ -44336,6 +34396,7 @@
 +	$(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
@@ -44744,6 +34805,7 @@
 -	$(INSTALL_DATA) $(srcdir)/crsc-app-applixware.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
 -	$(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)/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
@@ -44760,7 +34822,6 @@
 -	-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/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
@@ -44784,7 +34845,7 @@
 +	-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/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
@@ -45233,6 +35294,7 @@
 +	-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
@@ -45529,6 +35591,7 @@
 -	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/applixware.svgz
 -	-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/16x16/apps/netscape.png
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/camera.svgz
 +	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/systemtray.png
@@ -45537,17 +35600,9 @@
  
  #>+ 15
  force-reedit:
---- pics/hicolor/Makefile.in
-+++ pics/hicolor/Makefile.in
-@@ -148,6 +148,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -250,6 +251,9 @@
+--- pics/Makefile.in
++++ pics/Makefile.in
+@@ -267,6 +267,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45557,17 +35612,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,6 +404,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -539,7 +545,7 @@
- all: docs-am  all-am
+@@ -559,7 +562,7 @@
+ all: docs-am  all-recursive
  
  .SUFFIXES:
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -45575,7 +35621,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +583,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -45589,15 +35635,7 @@
  mostlyclean-libtool:
 --- pics/wallpapers/Makefile.in
 +++ pics/wallpapers/Makefile.in
-@@ -158,6 +158,7 @@
- KDE_USE_PIE = @KDE_USE_PIE@
- KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
- KDM_PAM_SERVICE = @KDM_PAM_SERVICE@
-+KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@
- KRB4_INCS = @KRB4_INCS@
- KRB4_LIBS = @KRB4_LIBS@
- KRB4_RPATH = @KRB4_RPATH@
-@@ -260,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LINUXCDPOLLING = @LINUXCDPOLLING@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45607,16 +35645,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -410,6 +414,8 @@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
-+install_usbids_FALSE = @install_usbids_FALSE@
-+install_usbids_TRUE = @install_usbids_TRUE@
- jni_includes = @jni_includes@
- kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@
- kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@
-@@ -603,7 +609,7 @@
+@@ -606,7 +609,7 @@
  all: docs-am  all-am
  
  .SUFFIXES:
@@ -45625,7 +35654,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +647,9 @@
+@@ -644,9 +647,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  




More information about the pkg-kde-commits mailing list